From 81613055c3bb076b5e3a0705935fce3fef589778 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 27 Dec 2004 17:04:25 +0000
Subject: [PATCH] Small ChangeLog update.

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 471be94cf..e78d0aba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,13 @@
 	* mkvmerge: bug fix: Fixed a buffer overflow in the UTF-8 file
 	reading routines.
 
+2004-11-18  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: Implemented concatenating files with chapters.
+
+	* mkvmerge: Changed the "progress" output. It's now correct for
+	file concatenation, too.
+
 2004-11-17  Moritz Bunkus  <moritz@bunkus.org>
 
 	* Released v1.0.