Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
authorWarwick Allison <warwick.allison@nokia.com>
Fri, 14 Aug 2009 06:29:13 +0000 (16:29 +1000)
committerWarwick Allison <warwick.allison@nokia.com>
Fri, 14 Aug 2009 06:29:13 +0000 (16:29 +1000)
commit0c831b8cf84c72ee8673d1d38f4e93e350dddd5f
tree84fc3c89d73342ec70d77b2bdf99066f987536b8
parentb98b7d305ffebb700e471bd64a7dee59d947e056
parent4b1b93f3f97de70af316052bc38048f52631b9e4
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
examples/phonon/musicplayer/mainwindow.cpp
src/corelib/io/qurl.cpp
src/corelib/io/qurl.h