Andrey Kamaev b368f99d03 Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

..

15-puzzle

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

color-blob-detection

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

face-detection

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

hello-android

merged the trunk r8704:8716

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

image-manipulations

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

tutorial-0-androidcamera

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

tutorial-1-addopencv

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

tutorial-2-opencvcamera

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

tutorial-3-native

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

tutorial-4-mixed

Merged the trunk r8852:8880

2012-07-02 11:04:43 +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 Android samples

2012-06-28 17:14:29 +00:00

fix_properties.sh

merged Android samples

2012-06-28 17:14:29 +00:00

includeOpenCV.mk

Android samples are included into the Android package

2011-07-14 09:34:57 +00:00