- Committer: Michael Hasselmann
- Date: 2011-10-21 17:36:43 UTC
- mfrom: (1366.1.242)
- Revision ID: git-v1:fd59e04e0dd97f784f63f64bacc15f94e3b16419
Merge Harmattan master into Maliit master
Conflicts resolved by removing debian folder from Maliit version and strictly
preferring Harmattan otherwise.
Conflicts:
debian/changelog
debian/control
debian/meego-keyboard-dev.install
debian/rules
m-keyboard/theme/Notification_bg_L.png
m-keyboard/theme/Notification_bg_P.png
m-keyboard/theme/priority2_vkb_popup_press/vibra.ivt
m-keyboard/theme/priority2_vkb_sliding_press/vibra.ivt
Conflicts resolved by removing debian folder from Maliit version and strictly
preferring Harmattan otherwise.
Conflicts:
debian/changelog
debian/control
debian/meego-keyboard-dev.install
debian/rules
m-keyboard/theme/Notification_bg_L.png
m-keyboard/theme/Notification_bg_P.png
m-keyboard/theme/priority2_vkb_popup_press/vibra.ivt
m-keyboard/theme/priority2_vkb_sliding_press/vibra.ivt
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
doc
|
1 | 14 years ago | Mohammad Anwari | Initial public release |
|
||
|
example
|
1226 | 13 years ago | Pekka Vuorela | Changes: introduce half qwerty as an example RevB |
|
||
|
fixture_virtualkeyboard
|
1 | 14 years ago | Mohammad Anwari | Initial public release |
|
||
|
m-keyboard
|
27 | 14 years ago | Pekka Vuorela | Changes: renamed files to use m prefix RevBy: Tru |
|
||
|
meego-keyboard-quick
|
1198 | 13 years ago | Michael Hasselmann | New: A QML-based keyboard plugin RevBy: Mohammad |
|
||
|
tests
|
222 | 13 years ago | chning | Changes: unit_test/ -> tests/ RevBy: Pekka Vuorel |
|
||
|
translations
|
201 | 13 years ago | chning | Changes: add translations RevBy: Mohammad Anwari, |
|
||
.gitignore |
1164 | 13 years ago | Michael Hasselmann | Changes: Add vim-style file backups to .gitignore | 77 bytes |
|
|
|
config.pri |
1514 | 12 years ago | Jon Nordby | New: CONFIG+=enable-legacy build option RevBy: Ne | 445 bytes |
|
|
|
LICENSE |
1068 | 13 years ago | Mohammad Anwari | Changes: License changed from LGPL to BSD RevBy: | 1.5 KB |
|
|
|
m-keyboard.pro |
1515 | 12 years ago | Jon Nordby | New: qmake HELP=1 outputs build help RevBy: Trust | 1.6 KB |
|
|
|
meego-keyboard.schemas |
1309 | 13 years ago | Wang Zongxin | Changes: Implement Chinese transliteration. RevBy | 3.2 KB |
|
|
|
NEWS |
1517 | 12 years ago | Jon Nordby | Changes: Bump version to 0.80.6 | 16.1 KB |
|
|
|
README |
256.1.14 | 13 years ago | chning | Changes: Workaround for integration problem. RevB | 156 bytes |
|
|