Andrey Kamaev f666bd221f Merged the trunk r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00

..

.settings

…

jni

Merged the trunk r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00

res

…

src/org/opencv/samples/fd

Merged Android samples from trunk r8423 r8533

2012-06-01 08:45:45 +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

#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

AndroidManifest.xml

…

CMakeLists.txt

Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00