Lars Glud 4dcd37f699 Merge remote-tracking branch 'origin/master' into Openni2Support ...

Conflicts:
	modules/highgui/CMakeLists.txt
	modules/highgui/include/opencv2/highgui.hpp
	modules/highgui/include/opencv2/highgui/highgui_c.h

2014-07-20 14:28:10 +02:00

..

opencv2

Merge remote-tracking branch 'origin/master' into Openni2Support

2014-07-20 14:28:10 +02:00