Anatoly Baksheev 2229d91c50 Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz ... Conflicts: modules/viz/test/test_viz3d.cpp		2013-07-01 21:39:04 +04:00
..
include/opencv2	Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz	2013-07-01 21:39:04 +04:00
src	Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz	2013-07-01 21:39:04 +04:00
test	Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz	2013-07-01 21:39:04 +04:00
CMakeLists.txt	boost dependency has been removed	2013-05-30 20:01:33 +02:00