Merge branch 'master' of git.kde.org:amarok
authorDaniel Faust <hessijames@gmail.com>
Mon, 8 Aug 2011 13:04:54 +0000 (15:04 +0200)
committerDaniel Faust <hessijames@gmail.com>
Mon, 8 Aug 2011 13:04:54 +0000 (15:04 +0200)
commitc8838f25e18251715bcee2e25774e5fa7de7f792
treecd4ceacb25a9a9f43f9fc42134d3b1180a8e7071
parent1e28f789f8d4d0d95da9de1c0daf1344f62b3374
parentb01bee2aac882e8a1dc891094f5bd769978fd216
Merge branch 'master' of git.kde.org:amarok
src/EngineController.cpp
src/EngineController.h
src/main.cpp