Merge lp://staging/~townsend/libertine/0.99.11-release into lp://staging/libertine/trunk
Proposed by
Christopher Townsend
| Status: | Merged |
|---|---|
| Approved by: | Stephen M. Webb |
| Approved revision: | 118 |
| Merged at revision: | 118 |
| Proposed branch: | lp://staging/~townsend/libertine/0.99.11-release |
| Merge into: | lp://staging/libertine/trunk |
| Diff against target: |
735 lines (+354/-15) 19 files modified
data/CMakeLists.txt (+1/-1) data/libertine-xmir.conf (+8/-0) data/libertine.desktop (+3/-3) data/puritine-click.conf (+3/-1) debian/changelog (+16/-0) debian/libertine-tools.install (+2/-0) libertine/ContainerConfig.cpp (+27/-0) libertine/ContainerConfig.h (+4/-0) libertine/ContainerConfigList.cpp (+22/-0) libertine/ContainerConfigList.h (+6/-0) libertine/ContainerManager.cpp (+49/-0) libertine/ContainerManager.h (+17/-1) libertine/qml/ConfigureContainer.qml (+69/-0) libertine/qml/HomeView.qml (+4/-2) python/libertine/Libertine.py (+21/-3) python/libertine/LxcContainer.py (+6/-1) tools/CMakeLists.txt (+1/-1) tools/libertine-container-manager (+76/-2) tools/libertine-xmir (+19/-0) |
| To merge this branch: | bzr merge lp://staging/~townsend/libertine/0.99.11-release |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stephen M. Webb (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Add a way to call Xmir with different options than what is hardcoded in ubuntu-app-launch. (LP: #1542028)
* Use '-title @' Xmir option to set proper XMir window titles.
* Add ability to enable or disable i386 multiarch support in a Libertine container. (LP: #1518812)
* libertine-demo: do not remove the ContainersConfig file if there are still containers.
* remove the unnecessary quotes from the .desktop file.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Sane.