Merge lp://qastaging/~kroq-gar78/unity-lens-music/fix-972987 into lp://qastaging/unity-lens-music

Proposed by Aditya V
Status: Merged
Approved by: Michal Hruby
Approved revision: 79
Merged at revision: 125
Proposed branch: lp://qastaging/~kroq-gar78/unity-lens-music/fix-972987
Merge into: lp://qastaging/unity-lens-music
Diff against target: 40 lines (+6/-6)
2 files modified
src/daemon.vala (+1/-1)
src/genre.vala (+5/-5)
To merge this branch: bzr merge lp://qastaging/~kroq-gar78/unity-lens-music/fix-972987
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+101165@code.qastaging.launchpad.net

Commit message

Changed the "Classic" filter to "Classical"

Description of the change

I changed the "Classic" filter to "Classical" because everywhere I've been, I never really hear classical music being referred to as classic music. If you feel that it should be "Classic" and not "Classical", please reject this proposal.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

We got a +1 from the design, could you please merge your branch with trunk? Currently there are conflicts.

review: Needs Fixing
79. By Aditya V

Merge lp:unity-lens-music to fix all merging conflicts

Revision history for this message
Aditya V (kroq-gar78) wrote :

Ok, I think I fixed all of the merging conflicts with lp:unity-lens-music :)

Revision history for this message
Michal Hruby (mhr3) wrote :

Great, thanks a lot!

review: Approve

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: