Changeset 404:59d3aa4f921f in lemon-1.2 for lemon

Timestamp:

12/01/08 15:18:40 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

407:e22fc10ab6f1, 409:b8ce15103485

Parents:

398:532f34ea9cf3 (diff), 403:940587667b47 (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) (2 diffs)

lemon/Makefile.am

@@ -21 +21 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/circulation.h \
         lemon/color.h \
         lemon/concept_check.h \

lemon/Makefile.am

@@ -29 +29 @@
         lemon/dijkstra.h \
         lemon/dim2.h \
+        lemon/dimacs.h \
         lemon/elevator.h \
         lemon/error.h \
@@ -44 +45 @@
         lemon/nauty_reader.h \
         lemon/path.h \
+        lemon/preflow.h \
         lemon/random.h \
         lemon/smart_graph.h \