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

diff --cc src/lua.c
Simple merge
diff --cc src/script.c
Simple merge