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/config/core.filelist
+++ b/modules/java/config/core.filelist
@@ -1 +1,2 @@
 include/opencv2/core/core.hpp
+../java/src/cpp/core_manual.hpp
--- a/modules/java/config/nonfree.filelist
+++ b/modules/java/config/nonfree.filelist