Changeset 395:0c5dd7ceda03 in lemon-main

Timestamp:

11/30/08 10:39:34 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

396:c5f010a5647a, 405:6b9057cdcd8b, 406:a578265aa8a6, 414:05357da973ce

Parents:

394:e7707b3069f1 (diff), 388:0a3ec097a76c (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

Message:

Merge

Files:

• lemon/Makefile.am (modified) (1 diff)
• lemon/Makefile.am (modified) (1 diff)

lemon/Makefile.am

@@ -44 +44 @@
         lemon/nauty_reader.h \
         lemon/path.h \
+        lemon/preflow.h \
         lemon/random.h \
         lemon/smart_graph.h \

lemon/Makefile.am

@@ -28 +28 @@
         lemon/dijkstra.h \
         lemon/dim2.h \
+        lemon/dimacs.h \
         lemon/elevator.h \
         lemon/error.h \