summaryrefslogtreecommitdiffstats
path: root/src/ibustext.h
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2009-03-20 14:07:30 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2009-03-20 14:07:30 +0800
commit0aa48a09c1ccca63e6909204e1ec673dff2341c2 (patch)
treef4e85128f8178761e28ce65f655e9ab477c153ac /src/ibustext.h
parent1a76fee5d5c7926e0d4f54a5dbd34bff8007d062 (diff)
parentab417dd043ee6ba338518758c1c833f6ccbb7bdf (diff)
downloadibus-definite.tar.gz
ibus-definite.tar.xz
ibus-definite.zip
Merge commit 'origin/master' into definitedefinite
Conflicts: po/fr.po
Diffstat (limited to 'src/ibustext.h')
0 files changed, 0 insertions, 0 deletions