Merge lp:~u-milan/dockmanager/audacious_helper into lp:dockmanager
Proposed by
Milán Unicsovics
Status: | Superseded |
---|---|
Proposed branch: | lp:~u-milan/dockmanager/audacious_helper |
Merge into: | lp:dockmanager |
Diff against target: |
341 lines (+328/-0) (has conflicts) 2 files modified
metadata/audacious.py.info (+7/-0) scripts/audacious.py (+321/-0) Conflict adding file metadata. Moved existing file to metadata.moved. Conflict adding file scripts. Moved existing file to scripts.moved. |
To merge this branch: | bzr merge lp:~u-milan/dockmanager/audacious_helper |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dockers | Pending | ||
Review via email: mp+44956@code.launchpad.net |
This proposal has been superseded by a proposal from 2011-01-01.
To post a comment you must log in.
Unmerged revisions
- 4. By Milán Unicsovics
-
merge trunk
- 3. By Milán Unicsovics
-
remove badge when playing stoppped
- 2. By Milán Unicsovics
-
merge trunk
- 1. By Milán Unicsovics
-
setup