# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1319485174 -7200
# Node ID 2b47dbd6612c14010d2ad5b90e1546b6797c8ec3
# Parent  54abdfda0076821cc775bbe21ba57c7de475becf# Parent  b96574ff36ecfc6e25fb89c46e314c4be0f500eb
Merge #428 and #429 to branch 1.1

diff -r 54abdfda0076 -r 2b47dbd6612c lemon/Makefile.am
--- a/lemon/Makefile.am	Mon Aug 08 13:35:38 2011 +0200
+++ b/lemon/Makefile.am	Mon Oct 24 21:39:34 2011 +0200
@@ -1,5 +1,6 @@
 EXTRA_DIST += \
 	lemon/lemon.pc.in \
+	lemon/lemon.pc.cmake \
 	lemon/CMakeLists.txt \
 	lemon/config.h.cmake
 
diff -r 54abdfda0076 -r 2b47dbd6612c test/lgf_test.cc
--- a/test/lgf_test.cc	Mon Aug 08 13:35:38 2011 +0200
+++ b/test/lgf_test.cc	Mon Oct 24 21:39:34 2011 +0200
@@ -117,7 +117,7 @@
       digraphReader(d, input).
         run();
     }
-    catch (FormatError& error)
+    catch (FormatError&) 
       {
         ok = true;
       }
@@ -131,7 +131,7 @@
       graphReader(g, input).
         run();
     }
-    catch (FormatError& error)
+    catch (FormatError&)
       {
         ok = true;
       }
@@ -146,7 +146,7 @@
       digraphReader(d, input).
         run();
     }
-    catch (FormatError& error)
+    catch (FormatError&)
       {
         ok = true;
       }
@@ -160,7 +160,7 @@
       graphReader(g, input).
         run();
     }
-    catch (FormatError& error)
+    catch (FormatError&)
       {
         ok = true;
       }