opencv/modules/java
Andrey Kamaev dbd30d4fba Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
This reverts commit eb4ce67dac.

Conflicts:
	samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
..
android_lib Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt) 2012-10-11 17:09:57 +04:00
android_test Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core" 2012-10-15 17:53:57 +04:00
generator Merge pull request #40 from emchristiansen/manualBRISKFREAK 2012-10-12 12:31:11 +04:00
jar Add experimental support for desktop Java 2012-09-17 13:21:20 +04:00
check-tests.py Added new tests written by Hussein Abdinoor; Added support for new classes in features2d and imgproc 2011-08-10 12:35:22 +00:00
CMakeLists.txt Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt) 2012-10-11 17:09:57 +04:00