Remerged the 2.4.0 branch
authorAndrey Kamaev <no@email>
Wed, 2 May 2012 20:20:14 +0000 (20:20 +0000)
committerAndrey Kamaev <no@email>
Wed, 2 May 2012 20:20:14 +0000 (20:20 +0000)
commit3a1f85d4e81d4d1bdbd23de26207e0bcca7f67a4
tree4ce619d67bf1f35ed83d4e41e027194e196b80ed
parent77717e1abcdb3975925727e2a3180a67f0b77491
Remerged the 2.4.0 branch
41 files changed:
3rdparty/ffmpeg/ffopencv.c
3rdparty/lib/armeabi-v7a/libnative_camera_r2.2.0.so
3rdparty/lib/armeabi-v7a/libnative_camera_r2.3.3.so
3rdparty/lib/armeabi-v7a/libnative_camera_r3.0.1.so
3rdparty/lib/armeabi-v7a/libnative_camera_r4.0.0.so
3rdparty/lib/armeabi-v7a/libnative_camera_r4.0.3.so
3rdparty/lib/armeabi/libnative_camera_r2.2.0.so
3rdparty/lib/armeabi/libnative_camera_r2.3.3.so
3rdparty/lib/armeabi/libnative_camera_r3.0.1.so
3rdparty/lib/armeabi/libnative_camera_r4.0.0.so
3rdparty/lib/armeabi/libnative_camera_r4.0.3.so
3rdparty/lib/x86/libnative_camera_r2.3.3.so
3rdparty/lib/x86/libnative_camera_r3.0.1.so
3rdparty/lib/x86/libnative_camera_r4.0.3.so
doc/conf.py
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
modules/calib3d/test/test_chesscorners_timing.cpp
modules/core/CMakeLists.txt
modules/core/include/opencv2/core/devmem2d.hpp
modules/gpu/src/cuda/bf_match.cu
modules/gpu/src/pyrlk.cpp
modules/highgui/src/cap_ffmpeg.cpp
modules/highgui/src/cap_ffmpeg_impl_v2.hpp [deleted file]
modules/imgproc/doc/planar_subdivisions.rst [deleted file]
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
modules/java/gen_java.py
modules/java/src/cpp/converters.cpp
modules/java/src/cpp/converters.h
modules/java/src/java/core+MatOfByte.java
modules/java/src/java/core+MatOfDMatch.java
modules/java/src/java/core+MatOfDouble.java
modules/java/src/java/core+MatOfFloat.java
modules/java/src/java/core+MatOfInt.java
modules/java/src/java/core+MatOfKeyPoint.java
modules/java/src/java/core+MatOfPoint.java
modules/java/src/java/core+MatOfPoint2f.java
modules/java/src/java/core+MatOfPoint3.java
modules/java/src/java/core+MatOfPoint3f.java
modules/java/src/java/core+MatOfRect.java
modules/legacy/src/em.cpp
modules/legacy/test/test_em.cpp