merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00
parent 680a44189c
commit 01570fa800
179 changed files with 34149 additions and 113 deletions
--- a/modules/java/generator/config/core.filelist
+++ b/modules/java/generator/config/core.filelist
@@ -0,0 +1,2 @@
+include/opencv2/core/core.hpp
+../java/generator/src/cpp/core_manual.hpp
--- a/modules/java/generator/config/features2d.filelist
+++ b/modules/java/generator/config/features2d.filelist
@@ -0,0 +1 @@
+../java/generator/src/cpp/features2d_manual.hpp
--- a/modules/java/generator/config/nonfree.filelist
+++ b/modules/java/generator/config/nonfree.filelist
				`@@ -0,0 +1 @@`
				`../java/generator/src/cpp/features2d_manual.hpp`