Roman Donchenko 659d21332e Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/spinimages.cpp		2014-06-09 18:03:03 +04:00
..
doc	Merge pull request #2578 from akrynski:patch-1	2014-04-15 13:21:08 +04:00
include/opencv2	fixed defects from coverity.com	2014-02-23 20:21:08 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-06-09 18:03:03 +04:00
test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-22 14:28:00 +04:00