[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/9de02aa380de
changeset: 67:9de02aa380de
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Thu Feb 07 21:23:23 2008 +0000
description:
	Merge

diffstat:

2 files changed, 3 insertions(+)
lemon/Makefile.am |    1 +
test/Makefile.am  |    2 ++

diffs (30 lines):

diff -r 5f7a8570687d -r 9de02aa380de lemon/Makefile.am
--- a/lemon/Makefile.am	Thu Feb 07 11:52:16 2008 +0000
+++ b/lemon/Makefile.am	Thu Feb 07 21:23:23 2008 +0000
@@ -15,6 +15,7 @@ lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) 
 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 -r 5f7a8570687d -r 9de02aa380de test/Makefile.am
--- a/test/Makefile.am	Thu Feb 07 11:52:16 2008 +0000
+++ b/test/Makefile.am	Thu Feb 07 21:23:23 2008 +0000
@@ -10,6 +10,7 @@ check_PROGRAMS += \
 	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_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