Vadim Pisarevsky 31df47b6ea moved nonfree and a part of features2d to opencv_contrib/xfeatures2d		2014-08-11 23:26:39 +04:00
..
android_lib	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
android_test	Merge branch 'master' into python2and3	2014-07-31 01:13:16 -04:00
generator	moved nonfree and a part of features2d to opencv_contrib/xfeatures2d	2014-08-11 23:26:39 +04:00
test	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +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	Merge branch 'master' into python2and3	2014-08-07 01:04:26 -04:00