Merge lp:~ahayzen/cappella/cappella10_play_stream_2 into lp:cappella
Proposed by
Andrew Hayzen
Status: | Merged |
---|---|
Approved by: | Andrew Hayzen |
Approved revision: | 99 |
Merged at revision: | 99 |
Proposed branch: | lp:~ahayzen/cappella/cappella10_play_stream_2 |
Merge into: | lp:cappella |
Diff against target: |
314 lines (+145/-28) 8 files modified
cappella/data/default/format.js (+2/-0) cappella/data/glade/open_file_dialogs.ui (+1/-1) cappella/gui/widget/play_queue.py (+3/-3) cappella/library/podcast_web.py (+1/-13) cappella/library/stream.py (+90/-6) cappella/management/media.py (+3/-3) cappella/tool/media.py (+8/-2) cappella/tool/parser.py (+37/-0) |
To merge this branch: | bzr merge lp:~ahayzen/cappella/cappella10_play_stream_2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Hayzen | Approve | ||
Review via email: mp+161356@code.launchpad.net |
Description of the change
* Added basic support for .asx and .m3u formats
To post a comment you must log in.