Merge branch 'scripting-lua-unhook' (early part) into screen-scripting-soc
authorRui Guo <firemeteor.guo@gmail.com>
Mon, 15 Jun 2009 11:20:36 +0000 (19:20 +0800)
committerRui Guo <firemeteor.guo@gmail.com>
Mon, 15 Jun 2009 11:20:36 +0000 (19:20 +0800)
commitaa2b3239b15d33cb5b398fda6c03082c7ac397cb
treeee3b0df37fcf9ecbc1d4a2ef46b42d2314f6bac6
parent292b57249487eda7e0d53ff68275019334f15440
parentd03daed69b4632fd1168faf1fe4fd6ce789ca539
Merge branch 'scripting-lua-unhook' (early part) into screen-scripting-soc

Requires further modification.

Conflicts:
src/lua.c
src/scripts/cmdcallback.lua
src/lua.c
src/scripts/cmdcallback.lua