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

..

.settings

Fixed Android tests resources and settings

2011-06-30 14:16:14 +00:00

res

Added lbp cascade to the tests res/raw folder

2011-07-16 11:26:57 +00:00

src/org/opencv/test

Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"

2012-10-15 17:53:57 +04:00

.classpath

Java samples updated to be compatible with both old (2.2+) and new (3.0+) Android versions

2012-02-24 08:43:11 +00:00

.gitignore

Add gitignore for Android tests and samples

2012-09-10 15:48:57 +04:00

.project

Java samples updated to be compatible with both old (2.2+) and new (3.0+) Android versions

2012-02-24 08:43:11 +00:00

AndroidManifest.xml

merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00

CMakeLists.txt

Fix Android build with CMake 2.6.3-2.8.3

2012-09-04 16:21:44 +04:00