summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/ChangeLog10
-rw-r--r--doc/images/ChangeLog11
2 files changed, 10 insertions, 11 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 61df97b92b..6da07e1360 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * images/ChangeLog: Removed.
+ * ChangeLog: Merge images/ChangeLog.
+
+2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* common/ChangeLog: Removed.
* ChangeLog: Merge common/ChangeLog.
@@ -143,6 +148,10 @@
AM_INIT_AUTOMAKE([no-define foreign 1.6]).
* Makefile.am: Remove AUTOMAKE_OPTIONS.
+2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * images/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
2001-02-14 Joel Sherrill <joel@OARcorp.com>
* configure.ac: New mips supplement.
@@ -178,6 +187,7 @@
2002-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* common/Makefile.am: Require automake-1.5.
+ * images/Makefile.am: Require automake-1.5.
2002-01-17 Joel Sherrill <joel@OARcorp.com>
diff --git a/doc/images/ChangeLog b/doc/images/ChangeLog
deleted file mode 100644
index 11573d57b6..0000000000
--- a/doc/images/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
- * Makefile.am: Remove AUTOMAKE_OPTIONS.
-
-2002-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
- * Makefile.am: Require automake-1.5.
-
-2000-08-10 Joel Sherrill <joel@OARcorp.com>
-
- * ChangeLog: New file.