Roman Donchenko 983e75e5de Merge remote-tracking branch 'origin/master' into merge-2.4

2014-08-01 15:01:41 +04:00

..

15-puzzle

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-07-08 14:33:56 +04:00

camera-calibration

android: allow to build & run examples without Android OpenCV Manager

2014-06-06 18:01:04 +04:00

color-blob-detection

android: allow to build & run examples without Android OpenCV Manager

2014-06-06 18:01:04 +04:00

face-detection

put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.

2014-06-24 21:16:09 +04:00

hello-android

Extract imgcodecs module from highgui

2014-07-07 16:28:08 +04:00

image-manipulations

android: allow to build & run examples without Android OpenCV Manager

2014-06-06 18:01:04 +04:00

native-activity

Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs

2014-07-21 15:10:41 +04:00

tutorial-1-camerapreview

android: allow to build & run examples without Android OpenCV Manager

2014-06-06 18:01:04 +04:00

tutorial-2-mixedprocessing

android: allow to build & run examples without Android OpenCV Manager

2014-06-06 18:01:04 +04:00

tutorial-3-cameracontrol

android: allow to build & run examples without Android OpenCV Manager

2014-06-06 18:01:04 +04:00

.gitignore

Normalized file endings.

2013-08-21 18:59:25 +04:00

CMakeLists.txt

Split highgui module to videoio and highgui

2014-07-14 23:16:47 +04:00