[simple] rebasae
Merge branch 'simple-frontend'
option 4: read in IM name as string and set current IM
add option -s to send new imname to fcitx
update documentation for new -s option
[script] add a naive delay.
Merge branch 'remote-switch-im' of git://github.com/ohwgiles/fcitx
[dbus] add -s <imname> support for dbusremote
[config-default] add up/down to default paging key
[keyboard, quickphrase, autoeng, clipboard, table] fix choose modifier upper bound........ so really no one is using shift as choose modifier (or no one ever bother changing that setting? ..... = = .....)
[objpool] use align_to from utils
[lua] be compatible with Lua 5.2
[lua] find lua using pkg-config, add option to specify lua module name (version), fix uninitialized var
[diagnose] work around a weird bash bug (on chakra)
[xkb] use ~/.Xmodmap if exists.
Merge branch 'pull' of git://github.com/yuyichao/fcitx
[xkb] try fix duplicate source ~/.Xmodmap
[simple] move simple outside fcitx
[cmake] fix error when there is no po file added
[cmake] correct dependency