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

Merge branch 'master' of https://github.com/dumganhar/cocos2d-x

This commit is contained in:
James Chen 2013-03-20 14:46:13 +08:00
parent e728d5d6d0 489b37b4e7
commit 49083415d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
View File

@ -211,7 +211,7 @@
<Filter Include="Classes\ExtensionsTest\EditBoxTest">
<UniqueIdentifier>{18a69e7e-8ca7-475a-bfbb-7296baab16ce}</UniqueIdentifier>
</Filter>
<Filter Include="Classes\TimelineCallbackTest">
<Filter Include="Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest">
<UniqueIdentifier>{0ef55f53-411a-4661-b5d5-13930da52e68}</UniqueIdentifier>
</Filter>
</ItemGroup>
@ -484,7 +484,7 @@
<Filter>Classes\ExtensionsTest\EditBoxTest</Filter>
</ClCompile>
<ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.cpp">
<Filter>Classes\TimelineCallbackTest</Filter>
<Filter>Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -933,10 +933,10 @@
<Filter>Classes\ExtensionsTest\EditBoxTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackLayerLoader.h">
<Filter>Classes\TimelineCallbackTest</Filter>
<Filter>Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest</Filter>
</ClInclude>
<ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.h">
<Filter>Classes\TimelineCallbackTest</Filter>
<Filter>Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest</Filter>
</ClInclude>
</ItemGroup>
</Project>