mirror of https://github.com/axmolengine/axmol.git
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
This commit is contained in:
commit
65f51181c6
|
@ -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",
|
||||||
|
|
Loading…
Reference in New Issue