Merge pull request #2990 from vbystricky:highgui_split2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
commitda1ac359304df7e3a933e83babc5be5f49bc48a9
tree3016f98dffa3e61707b97a33bc814dfb6ff0189e
parent7bd7c85b1d1b8f5a3d9e8fccf082380254093fee
parentfd51c133dfadac7b6d6724b77559e647a3c49357
Merge pull request #2990 from vbystricky:highgui_split2
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h