Merge remote branch 'epico/lua-plugin' into lua-plugin
authorPeng Huang <shawn.p.huang@gmail.com>
Fri, 18 Jun 2010 03:25:15 +0000 (11:25 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Fri, 18 Jun 2010 03:25:15 +0000 (11:25 +0800)
commitf1944e652c6e4c73b87193c7e8cc82ccb0c35ddd
tree2e2ec9058151f7ac06f76547db125f4d16dda5b9
parentf1f93631962b46a8a2744796ebbb9fdc74c981ff
parent40093940e25ada4c0cf3c258ab49e9ebd32bbc65
Merge remote branch 'epico/lua-plugin' into lua-plugin

Conflicts:
src/ExtEditor.cc
src/ExtEditor.h
src/LookupTable.h
src/Makefile.am
src/PinyinEngine.cc
Makefile.am
configure.ac
src/ExtEditor.cc
src/ExtEditor.h
src/LookupTable.h
src/Makefile.am
src/PinyinEngine.cc