Michael Pratt c9876c3cd8 Merge branch 'master' into python2and3		2014-07-31 01:13:16 -04:00
..
.settings	Improving compatibility with the latest Android SDK (r21) and NDK (r8c).	2012-11-20 18:40:22 +04:00
res	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-10 11:30:19 +04:00
src/org/opencv/test	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
.classpath	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
.gitignore	Normalized file endings.	2013-08-21 18:59:25 +04:00
.project	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
AndroidManifest.xml	Delete a bunch more trailing whitespace that slipped through the cracks.	2013-09-04 16:13:27 +04:00
CMakeLists.txt	Build both Python 2 and Python 3 bindings	2014-06-29 20:08:13 -04:00