Roman Donchenko 313a0ad255 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/internal.hpp modules/core/src/arithm.cpp modules/imgproc/src/imgwarp.cpp modules/objdetect/src/hog.cpp		2014-05-12 17:38:07 +04:00
..
include/opencv2	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
CMakeLists.txt	fix for compiling 2.4 opencv with xcode 5.1	2014-04-18 13:42:47 +02:00