Merge branch 'lua-scripting' (early part) into screen-scripting-soc
commit6908312022d25ba8c0ddac73e194d59fa5f9f2f6
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)
tree8ab8b5ea2a3f80877a816a6ed2cc21ece93c99e0
parent7b5c438dc2ac1347fab834c1e53460d0e9c61476
parentc9937bbd76f0bb1720f9715e02806a2c995347f2
Merge branch 'lua-scripting' (early part) into screen-scripting-soc
src/script.c