Merged the trunk r8547:8574, r8587

This commit is contained in:
Andrey Kamaev
2012-06-15 08:36:35 +00:00
parent 4b1724aeb9
commit ab20da0f53
12 changed files with 133 additions and 33 deletions

View File

@@ -1 +1 @@
See http://opencv.willowgarage.com/wiki/Android
See http://code.opencv.org/projects/opencv/wiki/OpenCV4Android