Merge lp://staging/~mhr3/unity-lens-music/update-categories into lp://staging/unity-lens-music

Proposed by Michal Hruby
Status: Superseded
Proposed branch: lp://staging/~mhr3/unity-lens-music/update-categories
Merge into: lp://staging/unity-lens-music
Diff against target: 1081 lines (+281/-206)
28 files modified
.bzrignore (+43/-0)
Makefile.am (+9/-10)
configure.ac (+13/-11)
data/Makefile.am (+2/-2)
data/unity-scope-music.service.in (+1/-1)
debian/changelog (+9/-0)
debian/control (+1/-1)
debian/unity-lens-music.install (+3/-2)
debian/unity-scope-musicstores.install (+1/-1)
music-banshee.scope.in.in (+13/-0)
music-rhythmbox.scope.in.in (+5/-4)
musicstore.scope.in.in (+8/-0)
po/POTFILES.in (+3/-1)
src/Makefile.am (+2/-2)
src/banshee-collection.vala (+6/-3)
src/banshee-scope.vala (+6/-9)
src/categories.vala (+1/-1)
src/config.vala.in (+2/-0)
src/daemon.vala (+11/-103)
src/main.vala (+4/-3)
src/musicstore-collection.vala (+10/-5)
src/musicstore-daemon.vala (+10/-4)
src/musicstore-scope.vala (+6/-8)
src/player.vala (+1/-0)
src/rhythmbox-collection.vala (+5/-2)
src/rhythmbox-scope.vala (+6/-14)
src/simple-scope.vala (+97/-17)
tests/unit/Makefile.am (+3/-2)
To merge this branch: bzr merge lp://staging/~mhr3/unity-lens-music/update-categories
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+153860@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-03-18.

Commit message

Update category ids to match the master scope

Description of the change

Update category ids to match the master scope.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: