Andrey Kamaev 57d3152cd0 Merge branch '2.4'		2013-01-31 14:35:27 +04:00
..
.settings	Improving compatibility with the latest Android SDK (r21) and NDK (r8c).	2012-11-20 18:40:22 +04:00
res	Convert test image to losless format	2013-01-17 20:43:57 +04:00
src/org/opencv/test	Merge branch '2.4'	2013-01-31 14:35:27 +04:00
.classpath	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
.gitignore	Add gitignore for Android tests and samples	2012-09-10 15:48:57 +04:00
.project	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
AndroidManifest.xml	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
CMakeLists.txt	Hardly refactored CMake script for Java wrappers	2013-01-22 17:59:01 +04:00