- Committer: Victor Thompson
- Date: 2016-02-21 16:39:37 UTC
- mfrom: (952.1.21 trunk)
- Revision ID: victor.thompson@gmail.com-20160221163937-1aj5da7tyfi58alt
Merge of trunk and resolve conflict
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
app
|
815.2.1 | 9 years ago | Andrew Hayzen | * Move applications files into app folder |
|
||
|
debian
|
19.1.1 | 10 years ago | mhall119 | Add packaging |
|
||
|
po
|
132 | 10 years ago | Launchpad Translations on behalf of music-app-dev | Launchpad automatic translations update. |
|
||
|
tests
|
33.1.1 | 10 years ago | Victor Thompson | Add autopilot packaging. |
|
||
.bzrignore |
482.2.1 | 9 years ago | Andrew Hayzen | Merge translations back into .desktop file using i | 252 bytes |
|
|
|
apparmor.json |
896.1.1 | 8 years ago | Andrew Hayzen | * Add support for a content-hub source in both sin | 402 bytes |
|
|
|
AUTHORS |
952.4.33 | 8 years ago | vamrocks602 at gmail | added myself to the list of authors | 1.6 KB |
|
|
|
CMakeLists.txt |
951.2.2 | 8 years ago | Ken VanDine | fixed click build | 3.2 KB |
|
|
|
com.ubuntu.music_music.desktop.in.in |
656.1.1 | 9 years ago | Victor Thompson | Fix Ubuntu-Splash-Color to not get pulled into tra | 376 bytes |
|
|
|
com.ubuntu.music_music.url-dispatcher |
409.1.20 | 10 years ago | Andrew Hayzen | * Add music:// protocol * Modify URL handling | 85 bytes |
|
|
|
LICENSE.txt |
345.1.1 | 10 years ago | DanielHolm | Added license file. | 34.3 KB |
|
|
|
manifest.json.in |
952.8.1 | 8 years ago | Victor Thompson | Release 2.3 and start 2.4 | 696 bytes |
|
|
|
music-app-content.json |
896.1.1 | 8 years ago | Andrew Hayzen | * Add support for a content-hub source in both sin | 86 bytes |
|
|
|
music-app.in |
426.1.1 | 10 years ago | Olli Ries | making it work in the Unity8/preview session, bug | 92 bytes |
|
|
|
music-app.qmlproject |
435.1.1 | 9 years ago | Victor Thompson | Update translations to be built with CMake. | 936 bytes |
|
|
|
music-app.qmltheme |
895.1.1 | 8 years ago | Victor Thompson | Upgrade to Ubuntu Components 1.3 | 110 bytes |
|
|
|
README-Autopilot.md |
952.2.3 | 8 years ago | Girish Rawat | Edited READMEs | 3.2 KB |
|
|
|
README-Developers.md |
952.2.3 | 8 years ago | Girish Rawat | Edited READMEs | 2.4 KB |
|
|
|
README-Mergeproposal.md |
952.2.1 | 8 years ago | Girish Rawat | Expanded and fixed READMEs | 1 KB |
|
|
|
README-Translations.md |
952.2.2 | 8 years ago | Girish Rawat | Fixed typos and improved READMEs | 1.8 KB |
|
|
|
README.md |
952.2.4 | 8 years ago | Girish Rawat | Updated design section in README.md | 1 KB |
|
|