Vadim Pisarevsky 903f10c237 Merge pull request #3804 from polarfuchs99:master		2015-03-17 11:12:49 +00:00
..
android_lib	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
android_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
common_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
generator	Changes to be committed:	2015-03-07 12:53:32 +01:00
pure_test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03: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	Fixed mangled install layout on unix machines	2015-03-13 14:18:37 +03:00