Merge lp:~thomas-moenicke/phablet-extras/maliit-plugins-0.99-server into lp:phablet-extras/maliit-plugins
Proposed by
Thomas Moenicke
Status: | Merged |
---|---|
Approved by: | Ricardo Salveti |
Approved revision: | 2137 |
Merged at revision: | 2131 |
Proposed branch: | lp:~thomas-moenicke/phablet-extras/maliit-plugins-0.99-server |
Merge into: | lp:phablet-extras/maliit-plugins |
Prerequisite: | lp:~thomas-moenicke/phablet-extras/maliit-framework-server-upgrade-noquilt |
Diff against target: |
322 lines (+87/-37) 7 files modified
debian/changelog (+6/-0) debian/control (+3/-3) debian/rules (+2/-0) maliit-keyboard/lib/logic/dynamiclayout_p.h (+1/-1) maliit-keyboard/plugin/inputmethod.cpp (+65/-31) maliit-keyboard/plugin/inputmethod.h (+10/-0) maliit-keyboard/view/view.pro (+0/-2) |
To merge this branch: | bzr merge lp:~thomas-moenicke/phablet-extras/maliit-plugins-0.99-server |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Günter Schwann (community) | Approve | ||
Review via email: mp+172799@code.launchpad.net |
Commit message
update to latest server
Description of the change
update to latest server
To post a comment you must log in.
FAILED: Continuous integration, rev:2135 jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- plugins- ci/71/ jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- plugins- saucy-armhf- ci/23/console jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- plugins- saucy-i386- ci/23/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ phablet- extras- maliit- plugins- ci/71/rebuild
http://