summaryrefslogtreecommitdiffstats
path: root/modules/zlib/src/ChangeLog.moz
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-08-05 11:35:53 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-08-05 11:35:53 +0200
commit6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch)
tree985faf01c526763515731569fa01a99f4dbef36e /modules/zlib/src/ChangeLog.moz
parente0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff)
parent559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff)
downloadUXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz
UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip
Merge branch 'master' into js-modules
Diffstat (limited to 'modules/zlib/src/ChangeLog.moz')
-rw-r--r--modules/zlib/src/ChangeLog.moz4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/zlib/src/ChangeLog.moz b/modules/zlib/src/ChangeLog.moz
index 12755d05a..98cd9f9c7 100644
--- a/modules/zlib/src/ChangeLog.moz
+++ b/modules/zlib/src/ChangeLog.moz
@@ -63,3 +63,7 @@ Mozilla.org changes:
(keeping '#include "mozzconf.h"' in zconf.h)
See bug #866964
+- 16 January 2017
+ Sync'ed with 1.2.11 release
+ (keeping '#include "mozzconf.h"' in zconf.h)
+ See bug #1328099