concatenate two ChangeLog files together

2 files changed, 88 insertions, 88 deletions

diff --git a/ChangeLog b/ChangeLog
index 61ecc02..172fd88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -283,3 +283,91 @@
 	  NEWS, README, TODO, makedefs.mak, src: Created a trunk directory
 	  to make tags possible.
 
+2005-09-10 01:20  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/javatoolkit, src/buildparser: Added code from
+          Chewi.
+
+2004-12-20 20:32  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* ChangeLog, Makefile: Added bsfix to the dist and install targets
+	  (untested)
+
+2004-12-20 20:30  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* .usermap: Added usermap for ChangeLog generation
+
+2004-12-20 20:23  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* ChangeLog: [no log message]
+
+2004-12-20 20:14  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/bsfix/: JXSLT.java, bsfix: JXSLT from Jan and a command line
+	  wrapper for it
+
+2004-12-20 20:13  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/bsfix/Makefile: Added initial Makefile
+
+2004-12-20 20:13  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/bsfix/: bsfix-eclipse.py, bsfix.py: Renamed directory to
+	  bsfix
+
+2004-11-08 21:06  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/javatoolkit/classpath.py: Fixed indentation
+
+2004-11-08 20:31  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/javatoolkit/: classpath.py, parser/buildproperties.py,
+	  parser/helpers.py: Fixed documentation.
+
+2004-11-08 20:21  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/javatoolkit/: .cvsignore, __init__.py, classpath.py,
+	  output.py, parser/.cvsignore, parser/__init__.py,
+	  parser/buildproperties.py, parser/helpers.py, parser/tree.py:
+	  Major fixes to the Eclipse buildscript fixer
+
+2004-10-11 16:20  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* ChangeLog, src/javatoolkit/__init__.py,
+	  src/javatoolkit/classpath.py, src/javatoolkit/parser/__init__.py,
+	  src/javatoolkit/parser/buildproperties.py,
+	  src/javatoolkit/parser/helpers.py: Added initial Ant build script
+	  fixer
+
+2004-08-10 23:11  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/sun-fetch/: TODO, sun-fetch: [no log message]
+
+2004-08-10 22:38  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* ChangeLog, makedefs.mak, src/sun-fetch/ChangeLog,
+	  src/sun-fetch/Makefile, src/sun-fetch/sun-fetch: [no log message]
+
+2004-08-10 22:06  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* COPYING, Makefile, makedefs.mak, src/findclass/AUTHORS,
+	  src/findclass/ChangeLog, src/findclass/Makefile,
+	  src/findclass/README, src/findclass/TODO,
+	  src/findclass/findclass.1, src/sun-fetch/AUTHORS,
+	  src/sun-fetch/ChangeLog, src/sun-fetch/Makefile,
+	  src/sun-fetch/README, src/sun-fetch/TODO,
+	  src/sun-fetch/sun-fetch.1: [no log message]
+
+2004-08-10 19:11  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/sun-fetch/sun-fetch.py: Reworked command line options
+
+2004-07-31 16:49  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* src/findclass/findclass: Added findclass
+
+2004-07-28 02:50  Karl Trygve Kalleberg <karltk@gentoo.org>
+
+	* AUTHORS, ChangeLog, INSTALL, NEWS, README, TODO,
+	  src/sun-fetch/sun-fetch.py: Initial import
+
diff --git a/ChangeLog.2004 b/ChangeLog.2004
deleted file mode 100644
index 783e0fd..0000000
--- a/ChangeLog.2004
+++ /dev/null
@@ -1,88 +0,0 @@
-2005-09-10 01:20  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/javatoolkit, src/buildparser: Added code from
-          Chewi.
-
-2004-12-20 20:32  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* ChangeLog, Makefile: Added bsfix to the dist and install targets
-	  (untested)
-
-2004-12-20 20:30  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* .usermap: Added usermap for ChangeLog generation
-
-2004-12-20 20:23  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* ChangeLog: [no log message]
-
-2004-12-20 20:14  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/bsfix/: JXSLT.java, bsfix: JXSLT from Jan and a command line
-	  wrapper for it
-
-2004-12-20 20:13  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/bsfix/Makefile: Added initial Makefile
-
-2004-12-20 20:13  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/bsfix/: bsfix-eclipse.py, bsfix.py: Renamed directory to
-	  bsfix
-
-2004-11-08 21:06  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/javatoolkit/classpath.py: Fixed indentation
-
-2004-11-08 20:31  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/javatoolkit/: classpath.py, parser/buildproperties.py,
-	  parser/helpers.py: Fixed documentation.
-
-2004-11-08 20:21  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/javatoolkit/: .cvsignore, __init__.py, classpath.py,
-	  output.py, parser/.cvsignore, parser/__init__.py,
-	  parser/buildproperties.py, parser/helpers.py, parser/tree.py:
-	  Major fixes to the Eclipse buildscript fixer
-
-2004-10-11 16:20  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* ChangeLog, src/javatoolkit/__init__.py,
-	  src/javatoolkit/classpath.py, src/javatoolkit/parser/__init__.py,
-	  src/javatoolkit/parser/buildproperties.py,
-	  src/javatoolkit/parser/helpers.py: Added initial Ant build script
-	  fixer
-
-2004-08-10 23:11  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/sun-fetch/: TODO, sun-fetch: [no log message]
-
-2004-08-10 22:38  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* ChangeLog, makedefs.mak, src/sun-fetch/ChangeLog,
-	  src/sun-fetch/Makefile, src/sun-fetch/sun-fetch: [no log message]
-
-2004-08-10 22:06  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* COPYING, Makefile, makedefs.mak, src/findclass/AUTHORS,
-	  src/findclass/ChangeLog, src/findclass/Makefile,
-	  src/findclass/README, src/findclass/TODO,
-	  src/findclass/findclass.1, src/sun-fetch/AUTHORS,
-	  src/sun-fetch/ChangeLog, src/sun-fetch/Makefile,
-	  src/sun-fetch/README, src/sun-fetch/TODO,
-	  src/sun-fetch/sun-fetch.1: [no log message]
-
-2004-08-10 19:11  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/sun-fetch/sun-fetch.py: Reworked command line options
-
-2004-07-31 16:49  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* src/findclass/findclass: Added findclass
-
-2004-07-28 02:50  Karl Trygve Kalleberg <karltk@gentoo.org>
-
-	* AUTHORS, ChangeLog, INSTALL, NEWS, README, TODO,
-	  src/sun-fetch/sun-fetch.py: Initial import
-