Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime

This commit is contained in:
chuanweizhang2013 2014-06-23 17:31:05 +08:00
commit 38401cb398
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 417bfcdce1633a4f00de1ddb1084c2d7c33a33ce
Subproject commit 79153cce443f3efbfd79c08835c63ec58a6c1462

@ -1 +1 @@
Subproject commit b911aa4504bc15b04c8e4cd5719a6c9aebbe9bc6
Subproject commit f5037bab73a8fb109e8e34656220bed1a1743087