Merge commit '83cdd43a' into merge-2.4

Conflicts: modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
parent 8c589438d1 83cdd43a4c
commit 9b7e77ccda
6 changed files with 37 additions and 29 deletions
--- a/modules/java/generator/src/java/android+OpenCVLoader.java
+++ b/modules/java/generator/src/java/android+OpenCVLoader.java
@@ -37,6 +37,10 @@ public class OpenCVLoader
     */
    public static final String OPENCV_VERSION_2_4_7 = "2.4.7";

+    /**
+     * OpenCV Library version 2.4.8.
+     */
+    public static final String OPENCV_VERSION_2_4_8 = "2.4.8";

    /**
     * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").