Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 18 Jan 2011 00:48:47 +0000 (10:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 18 Jan 2011 00:48:47 +0000 (10:48 +1000)
commit7296a5419cf1e0d616aa193829196ec42db55db4
tree18d39e20ddec01ed1785b38267cdeceba0a627c0
parentf612cb0f6bf4dd06fa344b1a5862985209fa5533
parentd7212b3b8b804c3621b0c39e9f07afecc5b39a4d
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert "Add a warning about trying to release a timer ID that isn't active"