summaryrefslogtreecommitdiff
path: root/zlib/ChangeLog.gcj
diff options
context:
space:
mode:
Diffstat (limited to 'zlib/ChangeLog.gcj')
-rw-r--r--zlib/ChangeLog.gcj4
1 files changed, 4 insertions, 0 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 7afe93793c2..8cce45d3023 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,7 @@
+2012-03-02 Matthias Klose <doko@ubuntu.com>
+
+ * Imported zlib 1.2.5; merged local changes.
+
2011-11-21 Andreas Tobler <andreast@fgznet.ch>
* configure: Regenerate.