Alexander Mordvintesv 7db1f711f6 Merge branch 'master' of code.opencv.org:opencv ... Conflicts: samples/python2/common.py samples/python2/feature_homography.py samples/python2/plane_ar.py samples/python2/plane_tracker.py		2012-08-07 23:21:56 +03:00
..
android	removing unused files	2012-07-24 23:58:52 +04:00
c	Fixed some warnings and install problems on linux	2012-06-27 12:02:31 +00:00
cpp	implemented DP-based seam estimation method	2012-08-07 16:24:21 +04:00
gpu	Fixed some warnings and install problems on linux	2012-06-27 12:02:31 +00:00
MacOSX/FaceTracker	"atomic bomb" commit. Reorganized OpenCV directory structure	2010-05-11 17:44:00 +00:00
python	svn repository web references are replaced with links to git	2012-08-07 14:30:36 +04:00
python2	Merge branch 'master' of code.opencv.org:opencv	2012-08-07 23:21:56 +03:00
CMakeLists.txt	Fixed some warnings and install problems on linux	2012-06-27 12:02:31 +00:00