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	Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"	2012-10-15 17:53:57 +04:00
c	add new version of CommandLineParser. add empty docs	2012-09-07 13:24:48 +04:00
cpp	let Kalman handle the missing measurements (bug #1380)	2012-10-12 14:01:36 +04:00
gpu	Move gpu sample to gpu folder	2012-09-10 19:17:50 +04:00
MacOSX/FaceTracker	"atomic bomb" commit. Reorganized OpenCV directory structure	2010-05-11 17:44:00 +00:00
ocl	make ocl surf sample compile on Linux	2012-09-13 17:34:06 +08:00
python	svn repository web references are replaced with links to git	2012-08-07 14:30:36 +04:00
python2	get rid of Lock in gabor_threads.py	2012-09-17 19:30:20 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00