lp:~music-app-dev/music-app/frankenstein-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:music-app/trusty at revision 24

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2013-06-05

Martin Mrazik (community): Approve on 2013-06-05

Daniel Holm: Approve on 2013-06-04

Diff: 1700 lines (+780/-705)

9 files modified

FirstRun.qml (+0/-54)
MusicSettings.qml (+13/-7)
MusicTracks.qml (+627/-96)
QueueDialog.qml (+4/-4)
Toolbar.qml (+0/-103)
debian/changelog (+7/-1)
debian/install (+9/-1)
music-app.qml (+86/-439)
playing-list.js (+34/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

33. By Victor Thompson on 2013-06-05

Added a space...

32. By Victor Thompson on 2013-06-04

Small change to toggle play indicator when forward or back is selected.

31. By Daniel Holm on 2013-06-04

Edit changelog once more.

30. By Daniel Holm on 2013-06-04

Edit changelog again.

29. By Daniel Holm on 2013-06-04

Removed NowPlaying.qml and edited changelog.

28. By Victor Thompson on 2013-06-04

Tweaked artist/album display on now playing.

27. By Victor Thompson on 2013-06-04

Tweaked some icon spacing and removed NowPlaying.qml. For now it is duplicate logic.

26. By Victor Thompson on 2013-06-04

Did some file management. Removed FirstRun.qml and Toolbar.qml.

25. By Victor Thompson on 2013-06-04

Add copyright and front matter to NowPlaying.

24. By Victor Thompson on 2013-06-04

Initial commit of franken-merge branch.