Merged the recent fixes from 2.4 branch

2012-07-04 08:04:31 +00:00
parent 4128d5782f
commit 51f6127e0a
50 changed files with 56780 additions and 45112 deletions
--- a/modules/java/android_lib/.project
+++ b/modules/java/android_lib/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OpenCV Library-2.4.2</name>
+	<name>OpenCV Library - 2.4.2</name>
 	<comment></comment>
 	<projects>
 	</projects>