Changeset 135:6e7aee618f03 in lemon-1.0 for lemon

Timestamp:

04/17/08 16:54:30 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

127:1c9a9e2f7d4d (diff), 134:0775d2ba2afb (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 with graph_to_eps.h & Co.

Files:

• lemon/Makefile.am (modified) (4 diffs)
• lemon/Makefile.am (modified) (3 diffs)

lemon/Makefile.am

@@ -10 +10 @@
         lemon/arg_parser.cc \
         lemon/base.cc \
+        lemon/color.cc \
         lemon/random.cc
 
@@ -21 +22 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/color.h \
         lemon/counter.h \
         lemon/dfs.h \
@@ -26 +28 @@
         lemon/dim2.h \
         lemon/error.h \
+        lemon/graph_to_eps.h \
         lemon/graph_utils.h \
         lemon/kruskal.h \
@@ -43 +46 @@
         lemon/bits/array_map.h \
         lemon/bits/base_extender.h \
+        lemon/bits/bezier.h \
         lemon/bits/default_map.h \
         lemon/bits/graph_extender.h \

lemon/Makefile.am

@@ -23 +23 @@
         lemon/bin_heap.h \
         lemon/color.h \
+        lemon/counter.h \
         lemon/dfs.h \
         lemon/dijkstra.h \
@@ -30 +31 @@
         lemon/graph_utils.h \
         lemon/kruskal.h \
+        lemon/lgf_reader.h \
         lemon/list_graph.h \
         lemon/maps.h \
@@ -36 +38 @@
         lemon/random.h \
         lemon/smart_graph.h \
+        lemon/time_measure.h \
         lemon/tolerance.h \
         lemon/unionfind.h