Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-wordengine-on into lp:phablet-extras/maliit-framework

Proposed by Thomas Moenicke
Status: Needs review
Proposed branch: lp:~thomas-moenicke/phablet-extras/maliit-framework-wordengine-on
Merge into: lp:phablet-extras/maliit-framework
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/server.conf (+1/-1)
To merge this branch: bzr merge lp:~thomas-moenicke/phablet-extras/maliit-framework-wordengine-on
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+175813@code.launchpad.net

Commit message

enabled word-engine by default in settings file

Description of the change

enabled word-engine by default in settings file

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

1561. By Thomas Moenicke on 2013-07-19

enabled word-engine by default in settings file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-12 11:38:03 +0000
3+++ debian/changelog 2013-07-19 11:47:37 +0000
4@@ -1,3 +1,9 @@
5+maliit-framework (0.99.trunk.phablet3) saucy; urgency=low
6+
7+ * enabled word-engine by default in settings file
8+
9+ -- Thomas Moenicke <thomas@pachamama> Fri, 19 Jul 2013 13:39:44 +0200
10+
11 maliit-framework (0.99.trunk.phablet2) saucy; urgency=low
12
13 * fix activationLostEvent: keyboard state should be updated and hidden
14
15=== modified file 'debian/server.conf'
16--- debian/server.conf 2013-07-12 11:38:03 +0000
17+++ debian/server.conf 2013-07-19 11:47:37 +0000
18@@ -2,7 +2,7 @@
19 onscreen\active=libmaliit-keyboard-plugin.so:en_us
20
21 pluginsettings\libmaliit-keyboard-plugin.so\current_style = ubuntu
22-pluginsettings\libmaliit-keyboard-plugin.so\word_engine_enabled = false
23+pluginsettings\libmaliit-keyboard-plugin.so\word_engine_enabled = true
24
25 onscreen\enabled=libmaliit-keyboard-plugin.so:en_gb, \
26 libmaliit-keyboard-plugin.so:en_us, \

Subscribers

People subscribed via source and target branches