Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 29 Apr 2009 16:55:27 +0100
changeset 68672ac25ad276e
parent 685 57e6f560fb13
parent 543 32fb28fc9d42
child 691 8d289c89d43e
Merge
lemon/Makefile.am
lemon/core.h
     1.1 --- a/lemon/Makefile.am	Tue Apr 28 11:25:47 2009 +0100
     1.2 +++ b/lemon/Makefile.am	Wed Apr 29 16:55:27 2009 +0100
     1.3 @@ -15,7 +15,8 @@
     1.4  	lemon/random.cc \
     1.5  	lemon/bits/windows.cc
     1.6  
     1.7 -
     1.8 +nodist_lemon_HEADERS = lemon/config.h	
     1.9 +	
    1.10  lemon_libemon_la_CXXFLAGS = \
    1.11  	$(AM_CXXFLAGS) \
    1.12  	$(GLPK_CFLAGS) \
    1.13 @@ -62,7 +63,6 @@
    1.14  	lemon/clp.h \
    1.15  	lemon/color.h \
    1.16  	lemon/concept_check.h \
    1.17 -	lemon/config.h \
    1.18  	lemon/connectivity.h \
    1.19  	lemon/counter.h \
    1.20  	lemon/core.h \
     2.1 --- a/lemon/core.h	Tue Apr 28 11:25:47 2009 +0100
     2.2 +++ b/lemon/core.h	Wed Apr 29 16:55:27 2009 +0100
     2.3 @@ -22,7 +22,7 @@
     2.4  #include <vector>
     2.5  #include <algorithm>
     2.6  
     2.7 -#include <lemon/core.h>
     2.8 +#include <lemon/config.h>
     2.9  #include <lemon/bits/enable_if.h>
    2.10  #include <lemon/bits/traits.h>
    2.11  #include <lemon/assert.h>