merged 2.4 into trunk · d5a0088bbe - opencv - Potok's private Git

potok/opencv

mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

merged 2.4 into trunk

This commit is contained in:

Vadim Pisarevsky

2012-04-30 14:33:52 +00:00

parent 3f1c6d7357

commit d5a0088bbe

194 changed files with 10158 additions and 8225 deletions

									
										modules/highgui/src/window_QT.cpp
									
		+2
		
												View File
												
				@@ -49,6 +49,8 @@

				#ifdef _WIN32

				#include <windows.h>

				#else

				#include <unistd.h>

				#endif

				#ifdef HAVE_QT_OPENGL