Roman Donchenko 33087f9eaa Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-06-02 13:43:28 +04:00

..

include/opencv2

cmd option

2014-04-17 18:06:14 +04:00

misc

run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag

2014-05-26 14:32:52 +04:00

src

cmd option

2014-04-17 18:06:14 +04:00

CMakeLists.txt

Merge commit '60906d917' into merge-2.4

2013-12-30 16:47:05 +04:00