Roman Donchenko fc37df05ec Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix		2013-08-29 16:35:38 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-27 19:15:47 +04:00
include/opencv2	Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix	2013-08-29 16:35:38 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-27 19:15:47 +04:00
test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00