Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain

This commit is contained in:
tangziwen 2015-04-03 16:58:27 +08:00
parent d79c38e17a 7ea1c1ac1f
commit 72f5121959
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
View File

@ -3319,7 +3319,7 @@
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CocoStudio.cpp">
<Filter>cocostudio\json</Filter>
<Filter>cocostudio\json</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit d20bd95b520374565d2c12b37f9fefc732f41891
Subproject commit af67671bfd8394e8a5e13d702e57f3fd7eaa5c78