Marina Kolpakova 01570fa800 merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00

..

15-puzzle

merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00

color-blob-detection

…

face-detection

merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00

hello-android

merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00

image-manipulations

merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00

tutorial-0-androidcamera

…

tutorial-1-addopencv

…

tutorial-2-opencvcamera

…

tutorial-3-native

merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00

tutorial-4-mixed

merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00

CMakeLists.txt

Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00

fix_properties.bat

merged the trunk r8669:8702

2012-06-28 15:41:27 +00:00

fix_properties.sh

…

includeOpenCV.mk

…