Frederik Gladhorn 6213b81457 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0		2013-06-20 16:45:12 +02:00
..
configure	Merge remote-tracking branch 'origin/stable' into dev	2013-06-20 16:45:12 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00