Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 17 Jan 2013 14:36:57 +0000 (18:36 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 17 Jan 2013 14:39:20 +0000 (18:39 +0400)
commitdc0788c864e6ae0d8e9db6a521d7346563015b97
tree9e89214170997cf7a61afe8301d5cfd4cef3a0e4
parent867ddebe07eaa06f7bef094206aafb3c7bfac8d4
parent101e9bd4561a157d9e599441d2ea59763e71f920
Merge branch 2.4
CMakeLists.txt
doc/tutorials/highgui/video-input-psnr-ssim/video-input-psnr-ssim.rst
modules/core/doc/operations_on_arrays.rst
modules/flann/doc/flann_fast_approximate_nearest_neighbor_search.rst
modules/java/android_test/src/org/opencv/test/features2d/FASTFeatureDetectorTest.java
modules/java/java_test/build.xml
modules/java/java_test/src/org/opencv/test/OpenCVTestRunner.java
modules/video/doc/motion_analysis_and_object_tracking.rst