Andrey Pavlenko 9f4c5afbbb merging r9039-9040,9044 from trunk (warnings and message in Java)		2012-07-15 13:20:38 +00:00
..
.settings	Android:	2011-07-16 22:31:47 +00:00
res	Merged the trunk r8852:8880	2012-07-02 11:04:43 +00:00
src/org/opencv/samples/puzzle15	merging r9039-9040,9044 from trunk (warnings and message in Java)	2012-07-15 13:20:38 +00:00
.classpath	#1283, Mat <->Bitmap converters are updated to support CV_8UC(1,3,4) & non-continuous Mat-s and RGBA_8888 & RGB_565 Bitmaps; Android samples project files are updated according to the latest SDK req-s.	2012-02-14 14:40:41 +00:00
.project	Merged the trunk r8852:8880	2012-07-02 11:04:43 +00:00
AndroidManifest.xml	updating screen resolutions support settings	2012-03-29 15:41:38 +00:00
CMakeLists.txt	Reworked build scripts for Android Java API, tests and examples	2012-03-27 16:05:52 +00:00