Merge pull request #2990 from vbystricky:highgui_split2

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)

committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
diff --cc modules/highgui/include/opencv2/highgui.hpp
Simple merge
diff --cc modules/highgui/include/opencv2/highgui/highgui_c.h
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
committer	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Wed, 23 Jul 2014 11:27:25 +0000 (11:27 +0000)
		1	2
modules/highgui/include/opencv2/highgui.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/highgui/include/opencv2/highgui/highgui_c.h	patch \|	diff1 \|	diff2 \|	blob \| history