# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2008-02-07 22:23:23
# Node ID 9de02aa380deef0eaa8604d0f6dace8bd3e39499
# Parent  5f7a8570687da3d6390480bdcd36f241fc28d541
# Parent  bfbc57a51fbbd6edd16d8e908a672f384a8f9df5

Merge

diff --git a/lemon/Makefile.am b/lemon/Makefile.am
--- a/lemon/Makefile.am
+++ b/lemon/Makefile.am
@@ -15,6 +15,7 @@
 lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 
 lemon_HEADERS += \
+        lemon/concept_check.h \
         lemon/dim2.h \
 	lemon/error.h \
 	lemon/list_graph.h \
diff --git a/test/Makefile.am b/test/Makefile.am
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,6 +10,7 @@
 	test/digraph_test \
         test/dim_test \
 	test/graph_test \
+        test/maps_test \
         test/random_test \
         test/test_tools_fail \
         test/test_tools_pass
@@ -21,6 +22,7 @@
 test_dim_test_SOURCES = test/dim_test.cc
 #test_error_test_SOURCES = test/error_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
+test_maps_test_SOURCES = test/maps_test.cc
 test_random_test_SOURCES = test/random_test.cc
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc
 test_test_tools_pass_SOURCES = test/test_tools_pass.cc