Merge branch 'scripting-python' (early part) into screen-scripting-soc
authorRui Guo <firemeteor.guo@gmail.com>
Fri, 12 Jun 2009 08:57:12 +0000 (16:57 +0800)
committerRui Guo <firemeteor.guo@gmail.com>
Fri, 12 Jun 2009 08:57:12 +0000 (16:57 +0800)
commit53e31fd497a34d3813d328c234c3d9f45c8787c6
tree3bf4e215357c7220cfa133848a109a0c53cc461d
parentfb9a16d3eef1c0c8f44134a01196c2955ba046cd
parent217f5af3bc468852fc2e6ae3731c213093bf5755
Merge branch 'scripting-python' (early part) into screen-scripting-soc
src/lua.c
src/script.c