Merge branch 'implementing_widgets' of https://github.com/ozantonkal/opencv into...
authorozantonkal <ozantonkal@gmail.com>
Mon, 15 Jul 2013 10:04:24 +0000 (12:04 +0200)
committerozantonkal <ozantonkal@gmail.com>
Mon, 15 Jul 2013 10:04:24 +0000 (12:04 +0200)
commitefbebe623699bec0a6a624ccb763819457cfb372
treeff8d72cbb8bcf06f66556c399473e83ca90b67b5
parent25f98bc0222cc327594cfdf0a6affce97bf310b6
parentacd63c1497b151e29f9f1d86b2e67c2479c1bbbb
Merge branch 'implementing_widgets' of https://github.com/ozantonkal/opencv into implementing_widgets
modules/viz/src/shape_widgets.cpp