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
..
2013-12-13 15:57:31 +04:00
2014-02-04 19:55:11 +04:00
2013-12-26 19:45:21 +08:00
2014-04-03 14:53:27 +04:00
2014-07-16 12:37:53 +02:00