Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
authorLars Knoll <lars.knoll@nokia.com>
Tue, 17 Apr 2012 11:01:20 +0000 (13:01 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 17 Apr 2012 11:09:29 +0000 (13:09 +0200)
1  2 
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
tests/auto/gui/kernel/kernel.pro

Simple merge