Marina Kolpakova 6cca6a4548 merged the trunk r8669:8702

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

..

15-puzzle

Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00

color-blob-detection

Merged Android samples from trunk r8423 r8533

2012-06-01 08:45:45 +00:00

face-detection

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

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

hello-android

Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support.

2011-11-16 14:32:10 +00:00

image-manipulations

Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00

tutorial-0-androidcamera

Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00

tutorial-1-addopencv

Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00

tutorial-2-opencvcamera

Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00

tutorial-3-native

Merged the trunk r8345:8376

2012-05-18 13:18:37 +00:00

tutorial-4-mixed

Merged the trunk r8547:8574, r8587

2012-06-15 08:36:35 +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

Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)

2012-05-30 11:13:07 +00:00

includeOpenCV.mk

Android samples are included into the Android package

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