Oswald Buddenhagen 143c4d3e13 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3		2012-04-10 15:31:45 +02:00
..
qwindow.pro	Don't ignore tst_QWindow on Mac OS X	2012-04-04 20:11:09 +02:00
tst_qwindow.cpp	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00