Frederik Gladhorn 5e8ae03578 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac		2013-03-05 13:42:11 +01:00
..
Makefile.mingw	Improve path search in configure.	2012-11-05 17:17:01 +01:00
Makefile.win32	Improve path search in configure.	2012-11-05 17:17:01 +01:00
configure.pro	Improve path search in configure.	2012-11-05 17:17:01 +01:00
configure_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
configureapp.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
configureapp.h	add -skip option to the configures	2013-02-20 15:22:55 +01:00
environment.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
environment.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	add -skip option to the configures	2013-02-20 15:22:55 +01:00
tools.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
tools.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00