Merge lp:~ted/indicator-sound/mega-merge into lp:~ted/indicator-sound/remove-vala-warnings
Proposed by
Ted Gould
Status: | Superseded | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~ted/indicator-sound/mega-merge | ||||||||||||||||||||
Merge into: | lp:~ted/indicator-sound/remove-vala-warnings | ||||||||||||||||||||
Diff against target: |
406 lines (+267/-2) 5 files modified
debian/changelog (+13/-0) src/service.vala (+19/-0) src/sound-menu.vala (+39/-1) src/volume-control.vala (+97/-1) tests/manual (+99/-0) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~ted/indicator-sound/mega-merge | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-11-05.
Commit message
Combining several MRs to resolve conflicts manually
To post a comment you must log in.
Unmerged revisions
- 469. By Ted Gould
-
Missed part of a merge
- 468. By Ted Gould
-
Fixing bug number
- 467. By Ted Gould
-
Ensure the greeter menu matches whether song metadata should be shown,
and update the metadata based on the new setting. (LP: #1358340) - 466. By Ted Gould
-
Integration test for silent mode
- 465. By Ted Gould
-
Integration test for audio roles
- 464. By Ted Gould
-
service.vala: don't call set_volume unnecessarily (LP: #1381871)
- 463. By Ted Gould
-
Warn on high audio levels when using headphones (LP: #123633, #1373404)
- 462. By Ted Gould
-
Show notifications on volume change (LP: #1378564, #1378961)
- 461. By Ted Gould
-
Remove various Vala warnings