Merge branch 'pagestack-shantanu' of git://anongit.kde.org/plasma-mediacenter into pagestack-shantanu
Conflicts:
browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/NavigationBar.qml
shantanu | Jun 21 2013, 7:22 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
33b1ecbbbc9e | shantanu | Intiail commit. Things are smooth! | Jun 21 2013 |