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	fixing project properties	2012-06-26 15:25:00 +00:00
res	Android samples renaming was done. Icon updated.	2012-07-02 10:06:08 +00:00
src/org/opencv/samples/colorblobdetect	Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"	2012-10-15 17:53:57 +04:00
.classpath	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
.project	Android samples renaming was done. Icon updated.	2012-07-02 10:06:08 +00:00
AndroidManifest.xml	Fix package name of Android color blob detection sample	2012-08-31 17:47:12 +04:00
CMakeLists.txt	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00