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
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
src	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00
qmake.qdocconf	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00