Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 12 Feb 2013 12:30:18 +0000 (16:30 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 12 Feb 2013 12:30:18 +0000 (16:30 +0400)
commitb44b9209974c32c63faf58e9008e462a41198448
treee765d041481b1466c6eea4e6977309868ad4f4b9
parentc527340cb6c13cbd67ab5498c528910f4956a3f9
parentb6e7aeabe0ff8b92deb15fcaa14b2572c522ef28
Merge branch '2.4'
13 files changed:
CMakeLists.txt
doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
modules/core/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/kernels/blend_linear.cl
modules/python/test/test2.py
modules/ts/src/ts_perf.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
samples/android/tutorial-1-camerapreview/CMakeLists.txt
samples/android/tutorial-3-cameracontrol/CMakeLists.txt