-
Committer:
Weng Xuetian
-
Date:
2012-01-30 10:27:46 UTC
-
mfrom:
(16.1.8)
-
Revision ID:
git-v1:2adf328a1e1e865bd3893220bb64d90eeef35f6c
Merge branch 'master' of https://github.com/fcitx/fcitx-ui-light
Conflicts:
src/MainWindow.c
src/MenuWindow.c
src/lightui.c
src/lightui.h