Roman Donchenko 6fed0e85c2 Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. ... They're not listed in the documentation for the FindZLIB module, so we shouldn't use them unless necessary.		2013-08-22 18:17:19 +04:00
..
doc	Merge branch 'master' into merge-2.4	2013-08-16 14:14:12 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00