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

..

opencv2

Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz

2013-07-01 21:39:04 +04:00