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	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
android_test	added cv::intergal to T-API	2013-12-06 13:18:25 +04:00
generator	Merge commit '83cdd43a' into merge-2.4	2013-12-30 16:36:35 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-22 14:28:00 +04:00
build.xml.in	Fix for encoding errors when building Java source	2013-03-27 17:43:00 +04:00
check-tests.py	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.	2013-12-19 17:41:04 +04:00