diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-05 11:03:39 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-05 11:03:39 +0800 |
| commit | 33aa241841500c0b59204d905e05d55fb273486c (patch) | |
| tree | e23ddce6a8a5d61201cfef7c29ffa6fa9c15861a /setup/keyboardshortcut.py | |
| parent | aaa9a8cea3a23bca6444221192ffc52ccbff3cb8 (diff) | |
| parent | a07a51ff63d323a7b742e30ad5368371023b4265 (diff) | |
| download | ibus-c_impl.tar.gz ibus-c_impl.tar.xz ibus-c_impl.zip | |
Merge branch 'master' into c_implc_impl
Conflicts:
po/ja.po
po/pa.po
po/zh_CN.po
Diffstat (limited to 'setup/keyboardshortcut.py')
0 files changed, 0 insertions, 0 deletions