Commit 6d4a1a1
committed
Fixed cocos2d#1643 modify conference for samples
1 parent 6396b24 commit 6d4a1a1
1 file changed
+1
-1
lines changed- games/CocosDragonJS/CocosDragonJS.ccbproj+4-4
- games/CocosDragonJS/Source/images/resources-large/gameobjects.plist+347
- games/CocosDragonJS/Source/images/resources-large/gameobjects.png
- games/CocosDragonJS/Source/images/resources-small/gameobjects.plist+347
- games/CocosDragonJS/Source/images/resources-small/gameobjects.png
- games/CocosDragonJS/Source/images/resources-xlarge/gameobjects.plist+347
- games/CocosDragonJS/Source/images/resources-xlarge/gameobjects.png
- games/CrystalCraze/CrystalCraze.ccbproj+3-3
- games/CrystalCraze/Resources/MainScene.js+1-1
- games/CrystalCraze/Resources/sounds/loop.mp3
- games/CrystalCraze/Resources/sounds/loop.wav
- games/WatermelonWithMe/res/CCB/MainMenu.ccb+13-13
- games/WatermelonWithMe/res/CCB/MainMenu.ccbi
- games/WatermelonWithMe/res/CCB/Watermelon.ccbproj
- games/WatermelonWithMe/res/CCB/Watermelon.ccbresourcelog
- games/WatermelonWithMe/res/CCB/fileLookup.plist+13
- tests/EaseActionsTest/EaseActionsTest.js+19-14
- tests/ExtensionsTest/S9SpriteTest/S9SpriteTest.js+269-20
- tests/FileUtils/FileUtilsTest.js+3-3
- tests/LabelTest/LabelTest.js+8-6
- tests/SpriteTest/SpriteTest.js+28-5
- tests/res/Images/blocks9ss.plist+87
- tests/res/Images/blocks9ss.png
- tests/tests_resources-html5.js+8-1
- tests/tests_resources-jsb.js+3
0 commit comments