Changeset 366:efbd0ab50a77 in lemon-main
- Timestamp:
- 11/06/08 15:40:32 (16 years ago)
- Branch:
- default
- Children:
- 367:9194a12c52e6, 368:a7e8ad460d66
- Parents:
- 363:a637fb9d457b (diff), 365:a12eef1f82b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 4 edited
-
lemon/Makefile.am (modified) (1 diff)
-
lemon/Makefile.am (modified) (1 diff)
-
tools/lemon-0.x-to-1.x.sh (modified) (1 diff)
-
tools/lemon-0.x-to-1.x.sh (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r363 r366 32 32 lemon/graph_to_eps.h \ 33 33 lemon/grid_graph.h \ 34 lemon/hypercube_graph.h \ 34 35 lemon/kruskal.h \ 35 36 lemon/lgf_reader.h \ -
lemon/Makefile.am
r364 r366 13 13 lemon/random.cc 14 14 15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) 15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS) 16 16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) 17 17 -
tools/lemon-0.x-to-1.x.sh
r359 r366 82 82 -e "s/\<copyGraph\>/graphCopy/g"\ 83 83 -e "s/\<copyDigraph\>/digraphCopy/g"\ 84 -e "s/\<HyperCubeDigraph\>/HypercubeGraph/g"\ 84 85 -e "s/\<IntegerMap\>/RangeMap/g"\ 85 86 -e "s/\<integerMap\>/rangeMap/g"\ -
tools/lemon-0.x-to-1.x.sh
r365 r366 92 92 -e "s/\<storeBoolMap\>/loggerBoolMap/g"\ 93 93 -e "s/\<BoundingBox\>/Box/g"\ 94 -e "s/\<readNauty\>/readNautyGraph/g"\ 94 95 <$i > $TMP 95 96 mv $TMP $i
Note: See TracChangeset
for help on using the changeset viewer.
