Vladislav Vinogradov 6bbac2a7d9 Merge branch 'master' into gpu-cuda-rename		2013-09-11 09:41:23 +04:00
..
android_lib	Merge pull request #800 from asmorkalov:android_cam_idx_semantic	2013-04-29 10:00:08 +04:00
android_test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-10 11:30:19 +04:00
generator	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +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	fix for #3077	2013-06-14 20:25:23 +04:00