Merge lp:~dobey/libubuntuone/update-from-trunk into lp:libubuntuone/stable-3-0
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 148 |
Proposed branch: | lp:~dobey/libubuntuone/update-from-trunk |
Merge into: | lp:libubuntuone/stable-3-0 |
Diff against target: |
312 lines (+57/-71) 11 files modified
.bzrignore (+1/-2) Makefile.am (+4/-7) configure.ac (+13/-19) libubuntuoneui.pc.in (+4/-4) libubuntuoneui/Makefile.am (+13/-13) libubuntuoneui/u1-codec-installer.c (+12/-6) libubuntuoneui/u1-music-store.c (+3/-1) po/POTFILES.in (+3/-3) tests/Makefile.am (+3/-3) tests/test-music-store.c (+1/-1) ubuntuone-sharp.pc.in (+0/-12) |
To merge this branch: | bzr merge lp:~dobey/libubuntuone/update-from-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Review via email: mp+90951@code.launchpad.net |
Commit message
Switch to webkitgtk-3.0
Move the current libubuntuone to libubuntuoneui
Update all the current references to libubuntuone to be libubuntuoneui
Add back a libubuntuone directory for coming code
Change the API version to 3.0 to break compat
Description of the change
Simple backport to stable-3-0 of what's already been merged in trunk, for the 2.99.3 release.
To post a comment you must log in.
Looks good.