merge with Itseez/opencv
authorOzan Tonkal <ozantonkal@gmail.com>
Sun, 15 Sep 2013 14:32:56 +0000 (16:32 +0200)
committerOzan Tonkal <ozantonkal@gmail.com>
Sun, 15 Sep 2013 15:51:27 +0000 (17:51 +0200)
commit3165b526f2b0d9b5a2ad98201ab5adf476223b29
treed5efbdea6844703cceb7f09aa92a1e19f254eb9f
parentc31fb8ffff9b5ec033124f5ea9a821d86ff66623
parenteff21788a80738db8b0a5901c21e447ff9134d96
merge with Itseez/opencv
modules/viz/include/opencv2/viz/types.hpp
modules/viz/src/interactor_style.cpp
modules/viz/src/precomp.hpp
modules/viz/src/types.cpp
modules/viz/src/viz3d_impl.cpp