Merged the recent fixes from 2.4 branch
authorAndrey Kamaev <no@email>
Wed, 4 Jul 2012 08:04:31 +0000 (08:04 +0000)
committerAndrey Kamaev <no@email>
Wed, 4 Jul 2012 08:04:31 +0000 (08:04 +0000)
commit51f6127e0a07cf7a2bda6bb664be89e0f1c5a247
tree159965977b34509fbb2b8151b6dccc469369d385
parent4128d5782fb2d0322e71efe6d9a1eb90be9145dc
Merged the recent fixes from 2.4 branch
50 files changed:
android/package/CMakeLists.txt
android/package/res/drawable/icon.png
android/package/res/values/strings.xml
android/service/doc/AsyncServiceHelper.rst [deleted file]
android/service/doc/IOpenCVEngine.rst [deleted file]
android/service/doc/Intro.rst
android/service/doc/JavaHelper.rst
android/service/doc/NativeHelper.rst [deleted file]
android/service/doc/OpenCVEngineInterface.rst [deleted file]
android/service/doc/StaticHelper.rst [deleted file]
android/service/doc/index.rst
android/service/engine/AndroidManifest.xml
android/service/engine/res/drawable/icon.png
android/service/engine/res/layout/main.xml
doc/opencv2refman.pdf
doc/opencv_tutorials.pdf
doc/opencv_user.pdf
doc/tutorials/introduction/android_binary_package/android_binary_package.rst
doc/tutorials/introduction/android_binary_package/android_binary_package_using_with_NDK.rst
doc/tutorials/introduction/android_binary_package/images/android_package_7zip.png
doc/tutorials/introduction/android_binary_package/images/eclipse_10_crystal_clean.png
doc/tutorials/introduction/android_binary_package/images/eclipse_7_select_projects.png
doc/tutorials/introduction/android_binary_package/images/eclipse_8_false_alarm.png
doc/tutorials/introduction/android_binary_package/images/eclipse_8a_target.png
doc/tutorials/introduction/android_binary_package/images/eclipse_9_errors_dissapearing.png
modules/contrib/doc/facerec/facerec_tutorial.rst
modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst
modules/java/android_lib/.project
modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
modules/java/android_test/src/org/opencv/test/features2d/BruteForceL1DescriptorMatcherTest.java
modules/java/android_test/src/org/opencv/test/features2d/BruteForceSL2DescriptorMatcherTest.java
modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java
modules/java/android_test/src/org/opencv/test/features2d/SURFDescriptorExtractorTest.java
modules/java/android_test/src/org/opencv/test/features2d/SURFFeatureDetectorTest.java
modules/java/generator/src/java/android+AsyncServiceHelper.java
modules/java/generator/src/java/android+OpenCVLoader.java
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15Activity.java
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
samples/android/face-detection/.cproject
samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/Sample0Base.java
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
samples/android/tutorial-3-native/.cproject
samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
samples/android/tutorial-4-mixed/.cproject
samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java