Roman Donchenko 1312eca220 Merge commit '0566ab4d3d' into merge-2.4 ... Conflicts: modules/core/src/system.cpp		2013-12-30 16:51:46 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
include/opencv2	fixes	2013-12-26 03:06:58 +04:00
perf	disabled cv::split perf test	2013-12-27 21:57:20 +04:00
src	Merge commit '0566ab4d3d' into merge-2.4	2013-12-30 16:51:46 +04:00
test	Merge pull request #2081 from ilya-lavrenov:tapi_perf	2013-12-28 22:06:12 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00