Merge branch 'lua-scripting' (early part) into screen-scripting-soc
authorRui Guo <firemeteor.guo@gmail.com>
Wed, 10 Jun 2009 06:23:00 +0000 (10 14:23 +0800)
committerRui Guo <firemeteor.guo@gmail.com>
Wed, 10 Jun 2009 06:23:00 +0000 (10 14:23 +0800)
1  2 
src/script.c

diff --cc src/script.c
Simple merge