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
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
global	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
io	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
json	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
kernel	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
mimetypes	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
plugin	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
statemachine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
thread	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-24 16:02:55 +01:00
xml	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00