Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix

This commit is contained in:
samuele3hu 2014-06-19 14:06:14 +08:00
commit 65f51181c6
1 changed files with 0 additions and 1 deletions

View File

@ -122,7 +122,6 @@
"exclude": [ "exclude": [
"proj.android/bin", "proj.android/bin",
"proj.android/assets", "proj.android/assets",
"proj.android/libs",
"proj.ios_mac/HelloLua.xcodeproj/project.xcworkspace", "proj.ios_mac/HelloLua.xcodeproj/project.xcworkspace",
"proj.ios_mac/HelloLua.xcodeproj/xcuserdata", "proj.ios_mac/HelloLua.xcodeproj/xcuserdata",
"proj.win32/Debug.win32", "proj.win32/Debug.win32",