Frederik Gladhorn 084c5b3db7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754		2013-07-23 11:18:11 +02:00
..
configure	Merge remote-tracking branch 'origin/stable' into dev	2013-07-23 11:18:11 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00