Merge branch 'TheCrasher-spectrumAnalyzer' of git.kde.org:amarok
authorDaniel Faust <hessijames@gmail.com>
Tue, 2 Aug 2011 09:15:26 +0000 (11:15 +0200)
committerDaniel Faust <hessijames@gmail.com>
Tue, 2 Aug 2011 09:15:26 +0000 (11:15 +0200)
commit1e28f789f8d4d0d95da9de1c0daf1344f62b3374
tree7294622f1eaab78682337b55b15b0a130f6df908
parente2f25ea9e4cffac3ed5c753b00890a8cd86cdaac
parentda519e52146279dae5d477ad3af8900324bcff78
Merge branch 'TheCrasher-spectrumAnalyzer' of git.kde.org:amarok
src/EngineController.cpp