Merge branch 'gsoc'
authorPhalgun Guduthur <me@phalgun.in>
Tue, 18 Sep 2012 21:03:48 +0000 (02:33 +0530)
committerPhalgun Guduthur <me@phalgun.in>
Tue, 18 Sep 2012 21:03:48 +0000 (02:33 +0530)
commitde09de6500eb015199ac5449bdf889c661177dd5
treef92ec0ccd6a45a1997b13b6ee2089b203c52edcc
parent6983babe870a2875eec98b8609a8d00b6e218dbf
parent0119f6d3a129aae106d1abc75bca944ebeceecd4
Merge branch 'gsoc'

* gsoc: (110 commits) (snipped)
Remove comment and make member collection variable private
collection should subscribe to each track after adding
Call notifyObservers() after changing rating of track
Implemented metaDataChanged
...

Conflicts:
src/core-impl/collections/nepomukcollection/amarok_collection-nepomukcollection.desktop

REVIEW: 106042
DIGEST: Nepomuk based plugin to play and manage tracks from Nepomuk.
http://blog.phalgun.in/tagged/gsoc
FEATURE: 174630
ChangeLog
src/core-impl/collections/nepomukcollection/amarok_collection-nepomukcollection.desktop