Marina Kolpakova 54ee92e3b0 merged trunk r8815:8827		2012-06-28 17:28:27 +00:00
..
jni	merged trunk r8815:8827	2012-06-28 17:28:27 +00:00
res	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
src/org/opencv/engine	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
.classpath	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
.project	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
AndroidManifest.xml	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
CMakeLists.txt	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00