Roman Donchenko 9b7e77ccda Merge commit '83cdd43a' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/version.hpp		2013-12-30 16:36:35 +04:00
..
android_lib
android_test
generator	Merge commit '83cdd43a' into merge-2.4	2013-12-30 16:36:35 +04:00
test
build.xml.in
check-tests.py
CMakeLists.txt