# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1319485342 -7200
# Node ID 4dd3dc8eb5a748bb9c6fed769aa9d1ba9d9f7481
# Parent  7f6eeffe3cd18a986893f4afdaf01403aafd0cd3# Parent  b96574ff36ecfc6e25fb89c46e314c4be0f500eb
Merge #428 and #429

diff -r 7f6eeffe3cd1 -r 4dd3dc8eb5a7 lemon/Makefile.am
--- a/lemon/Makefile.am	Sun Oct 23 22:42:14 2011 +0200
+++ b/lemon/Makefile.am	Mon Oct 24 21:42:22 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 7f6eeffe3cd1 -r 4dd3dc8eb5a7 test/lgf_test.cc
--- a/test/lgf_test.cc	Sun Oct 23 22:42:14 2011 +0200
+++ b/test/lgf_test.cc	Mon Oct 24 21:42:22 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;
       }