Frederik Gladhorn 627d9cbd3c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688		2013-01-24 16:02:55 +01:00
..
bic/data	tst_bic: Add linux-gcc-ia32 bic data for QtXml	2013-01-16 08:25:28 +01:00
cmake	Generate instances of types in the CMake tests.	2012-10-31 07:16:03 +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-01-24 16:02:55 +01:00
dbus	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
gui	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
guiapplauncher
network	Merge remote-tracking branch 'origin/stable' into dev	2013-01-24 16:02:55 +01:00
opengl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
other	Merge remote-tracking branch 'origin/stable' into dev	2013-01-24 16:02:55 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
testlib	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-01-24 16:02:55 +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