summaryrefslogtreecommitdiff
path: root/zlib/ChangeLog.gcj
diff options
context:
space:
mode:
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-02 17:15:20 +0000
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-02 17:15:20 +0000
commit1f54c5b654eac803f2707685ec2e687b57a0df66 (patch)
tree08301625dedcb8a8837a464f46ca0292c54c5ecb /zlib/ChangeLog.gcj
parentb49e3742cb50238370bdf071d9de7cfe3e448ca7 (diff)
downloadgcc-1f54c5b654eac803f2707685ec2e687b57a0df66.tar.gz
2012-03-02 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.5; merged local changes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184805 138bc75d-0d04-0410-961f-82ee72b054a4
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.