Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a		2013-08-14 09:06:31 +02:00
..
arch	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00
common	Disable app_bundle and lib_bundle when running configure tests	2013-07-16 13:44:18 +02:00
mac	Disable app_bundle and lib_bundle when running configure tests	2013-07-16 13:44:18 +02:00
qpa	Disable app_bundle and lib_bundle when running configure tests	2013-07-16 13:44:18 +02:00
unix	Disable app_bundle and lib_bundle when running configure tests	2013-07-16 13:44:18 +02:00
x11	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00