Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ... Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp		2013-08-27 13:23:26 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
include/opencv2	Merge pull request #1297 from SpecLad:merge-2.4	2013-08-20 14:10:22 +04:00
perf	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
src	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
test	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00