Merge pull request #1328 from SpecLad:zlib-update
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 23 Aug 2013 08:06:16 +0000 (12:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 23 Aug 2013 08:06:17 +0000 (12:06 +0400)
commit66aa3255b9039600cb506d2cba68817b3268c9d0
treece80e18b3ac88e2c680ce1ae71b43b22d0ee6a74
parent893e8b437127ced822f74cb053b573e2d3553b15
parent9c01a96b14655ae043888564cf12e6c6bc41edbd
Merge pull request #1328 from SpecLad:zlib-update