From f9f369258b274a62438dbbffb325d9f6f1b741c6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 13:47:11 +0800 Subject: [PATCH 1/2] Renames resource folder name from 'loadXXX' to 'LoadXXX' --- .../Images/startMenuBG.png.REMOVED.git-id | 0 .../Misc/music_logo.mp3.REMOVED.git-id | 0 .../Misc/music_logo.wav.REMOVED.git-id | 0 .../fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id | 0 .../fishes/blowFish/Blowfish0.png.REMOVED.git-id | 0 .../startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id | 0 .../startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id | 0 .../startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/Images/startMenuBG.png.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/Misc/music_logo.mp3.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/Misc/music_logo.wav.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/fishes/blowFish/Blowfish0.png.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id (100%) rename samples/Cpp/TestCpp/Resources/hd/scenetest/{loadSceneEdtiorFileTest => LoadSceneEdtiorFileTest}/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id (100%) diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/Cpp/TestCpp/Resources/hd/scenetest/loadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id From 7ae83848a9f98f6f3855883faf62b9f56206c7fe Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 6 Jan 2014 13:55:20 +0800 Subject: [PATCH 2/2] Updates JS-Tests submodule. --- samples/Javascript/Shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared index bc00ab95c9..d4c38884a6 160000 --- a/samples/Javascript/Shared +++ b/samples/Javascript/Shared @@ -1 +1 @@ -Subproject commit bc00ab95c9c2160452930da2f263ff8c926eb2cc +Subproject commit d4c38884a6f975073f551390732f1daaf9d41b38