Michael Pratt c9876c3cd8 Merge branch 'master' into python2and3		2014-07-31 01:13:16 -04:00
..
.settings
res
src/org/opencv/test
.classpath
.gitignore
.project
AndroidManifest.xml
CMakeLists.txt