Frederik Gladhorn dcb710dd87 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf		2013-02-20 22:08:29 +01:00
..
configure	Merge remote-tracking branch 'origin/stable' into dev	2013-02-20 22:08:29 +01:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00