• Home
  • History
  • Annotate
  • only in /external/chromium_org/third_party/zlib/google/
History log of /external/chromium_org/third_party/zlib/google/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 08-Dec-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
ip.target.darwin-mips64.mk
ip.target.linux-mips64.mk
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
ip_internal.cc
ip_reader.h
ip_reader_unittest.cc
ip_unittest.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
ip_internal.cc
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
ip_reader.cc
ip_reader.h
ip_reader_unittest.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
ip.target.darwin-arm.mk
ip.target.darwin-arm64.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-arm64.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
est/data/test_mismatch_size.zip
ip.cc
ip.h
ip.target.darwin-arm.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
ip_internal.cc
ip_internal.h
ip_reader.cc
ip_reader.h
ip_unittest.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ip.target.darwin-arm64.mk
ip.target.linux-arm64.mk
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
EPS
ip.cc
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.darwin-x86_64.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip.target.linux-x86_64.mk
ip_reader.cc
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip_reader.cc
ip_reader.h
ip_reader_unittest.cc
ip_unittest.cc
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ip.cc
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip_internal.cc
ip_reader.cc
ip_reader.h
ip_reader_unittest.cc
ip_unittest.cc
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ip.cc
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip_reader.cc
ip_unittest.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ip.target.darwin-x86.mk
ip.target.linux-x86.mk
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
ip_reader_unittest.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
ip.gyp
ip.target.darwin-arm.mk
ip.target.darwin-mips.mk
ip.target.darwin-x86.mk
ip.target.linux-arm.mk
ip.target.linux-mips.mk
ip.target.linux-x86.mk
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ip.cc
ip_reader_unittest.cc
ip_unittest.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ip_reader.h
ip_reader_unittest.cc
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ip.cc
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ip.cc
ip_reader.cc
ip_unittest.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
ip.cc
ip_internal.cc
ip_reader.cc
ip_reader_unittest.cc
ip_unittest.cc
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
EPS
WNERS
est/data/create_test_zip.sh
est/data/evil.zip
est/data/evil_via_absolute_file_name.zip
est/data/evil_via_invalid_utf8.zip
est/data/test.zip
est/data/test/foo.txt
est/data/test/foo/bar.txt
est/data/test/foo/bar/.hidden
est/data/test/foo/bar/baz.txt
est/data/test/foo/bar/quux.txt
est/data/test_nocompress.zip
ip.cc
ip.h
ip_internal.cc
ip_internal.h
ip_reader.cc
ip_reader.h
ip_reader_unittest.cc
ip_unittest.cc