Merge lp:~janez-troha/nuvola-player/8tracks into lp:nuvola-player/2.5.x
Proposed by
dz0ny
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jiří Janoušek | ||||
Approved revision: | 109 | ||||
Merged at revision: | 113 | ||||
Proposed branch: | lp:~janez-troha/nuvola-player/8tracks | ||||
Merge into: | lp:nuvola-player/2.5.x | ||||
Diff against target: |
169 lines (+87/-4) (has conflicts) 4 files modified
data/google-music-frame/scripts/eighttracks.js (+2/-2) src/application.vala (+1/-1) src/settings.vala (+9/-1) src/window.vala (+75/-0) Text conflict in src/window.vala |
||||
To merge this branch: | bzr merge lp:~janez-troha/nuvola-player/8tracks | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jiří Janoušek | Pending | ||
Review via email: mp+82830@code.launchpad.net |
Description of the change
Global menu
To post a comment you must log in.
I've already started to transform toolbar to menu, but I wil definitely combine my and your code. Thanks.