Changeset 708:5d313b76f323 in lemon-main

Timestamp:

08/31/09 10:03:23 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

700:6f7c1052d260 (diff), 707:3887d6f994d7 (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) (4 diffs)
• lemon/Makefile.am (modified) (2 diffs)

lemon/Makefile.am

@@ -61 +61 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/binom_heap.h \
         lemon/bucket_heap.h \
         lemon/cbc.h \
@@ -80 +81 @@
         lemon/euler.h \
         lemon/fib_heap.h \
+        lemon/fourary_heap.h \
         lemon/full_graph.h \
         lemon/glpk.h \
@@ -86 +88 @@
         lemon/grid_graph.h \
         lemon/hypercube_graph.h \
+        lemon/kary_heap.h \
         lemon/kruskal.h \
         lemon/hao_orlin.h \
@@ -100 +103 @@
         lemon/nauty_reader.h \
         lemon/network_simplex.h \
+        lemon/pairing_heap.h \
         lemon/path.h \
         lemon/preflow.h \

lemon/Makefile.am

@@ -58 +58 @@
         lemon/arg_parser.h \
         lemon/assert.h \
+        lemon/bellman_ford.h \
         lemon/bfs.h \
         lemon/bin_heap.h \
@@ -96 +97 @@
         lemon/lp_base.h \
         lemon/lp_skeleton.h \
-        lemon/list_graph.h \
         lemon/maps.h \
         lemon/matching.h \