Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
bic/data	Remove QPointerBase bic check.	2013-02-13 15:06:53 +01:00
cmake	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
corelib	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
dbus	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
gui	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
network	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
opengl	Remove duplicated code for handling OpenGL extensions in QtOpenGL	2013-02-17 20:31:30 +01:00
other	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
printsupport	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
testlib	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
xml	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
auto.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
network-settings.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtest-config.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
test.pl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00