merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/modules/java/android/.project
+++ b/modules/java/android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OpenCV-2.4.beta</name>
+	<name>OpenCV-2.4.0</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/modules/java/android/AndroidManifest.xml
+++ b/modules/java/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.opencv"
-      android:versionCode="1"
-      android:versionName="1.0">
+      android:versionCode="240"
+      android:versionName="2.4.0">
 </manifest>