Andrey Kamaev ab20da0f53 Merged the trunk r8547:8574, r8587		2012-06-15 08:36:35 +00:00
..
.settings	Android samples are renamed	2011-07-15 15:56:08 +00:00
jni	Merged the trunk r8547:8574, r8587	2012-06-15 08:36:35 +00:00
res	Merged the trunk r8345:8376	2012-05-18 13:18:37 +00:00
src/org/opencv/samples/tutorial4	Merged the trunk r8345:8376	2012-05-18 13:18:37 +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	updating Eclipse projects settings	2012-04-09 14:14:41 +00:00
AndroidManifest.xml	Continued Android samples renaming	2011-07-15 16:29:10 +00:00
CMakeLists.txt	Reworked build scripts for Android Java API, tests and examples	2012-03-27 16:05:52 +00:00