Changeset 953:d8ea85825e02 in lemon for lemon/Makefile.am

Timestamp:

03/16/10 21:27:35 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

952:23da1b807280 (diff), 951:41d7ac528c3a (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 #314

Files:

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

lemon/Makefile.am

@@ -61 +61 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
-        lemon/binom_heap.h \
+        lemon/binomial_heap.h \
         lemon/bucket_heap.h \
+        lemon/capacity_scaling.h \
         lemon/cbc.h \
         lemon/circulation.h \
@@ -69 +70 @@
         lemon/concept_check.h \
         lemon/connectivity.h \
+        lemon/core.h \
+        lemon/cost_scaling.h \
         lemon/counter.h \
-        lemon/core.h \
         lemon/cplex.h \
+        lemon/cycle_canceling.h \
         lemon/dfs.h \
+        lemon/dheap.h \
         lemon/dijkstra.h \
         lemon/dim2.h \
@@ -81 +85 @@
         lemon/euler.h \
         lemon/fib_heap.h \
-        lemon/fourary_heap.h \
         lemon/fractional_matching.h \
         lemon/full_graph.h \
@@ -88 +91 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/hartmann_orlin_mmc.h \
+        lemon/howard_mmc.h \
         lemon/hypercube_graph.h \
-        lemon/kary_heap.h \
+        lemon/karp_mmc.h \
         lemon/kruskal.h \
         lemon/hao_orlin.h \
@@ -106 +111 @@
         lemon/pairing_heap.h \
         lemon/path.h \
+        lemon/planarity.h \
         lemon/preflow.h \
+        lemon/quad_heap.h \
         lemon/radix_heap.h \
         lemon/radix_sort.h \
@@ -112 +119 @@
         lemon/smart_graph.h \
         lemon/soplex.h \
+        lemon/static_graph.h \
         lemon/suurballe.h \
         lemon/time_measure.h \

lemon/Makefile.am

@@ -85 +85 @@
         lemon/euler.h \
         lemon/fib_heap.h \
+        lemon/fractional_matching.h \
         lemon/full_graph.h \
         lemon/glpk.h \