Roman Donchenko 6133aeede8 Merge branch 'master' into merge-2.4 ... Conflicts: doc/tutorials/definitions/tocDefinitions.rst		2013-10-01 17:37:05 +04:00
..
doc	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
include/opencv2	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge branch 'master' into merge-2.4	2013-10-01 17:37:05 +04:00
test	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00