Merge pull request #3931 from dumganhar/develop

Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.
2013-10-11 23:53:39 -07:00 · 2013-10-11 23:53:39 -07:00 · 6cf79cb7c4
parent 11f24ba784 7de6646213
commit 6cf79cb7c4
20 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,11 +21,11 @@ Thumbs.db
 *.ilk
 *.log
 [Bb]in
-[Dd]ebug*/
+[Dd]ebug/
 *.sbr
 *.sdf
 obj/
-[Rr]elease*/
+[Rr]elease/
 _ReSharper*/
 [Tt]est[Rr]esult*
 ipch/
--- a/cocos/scripting/javascript/bindings/js/debugger/DevToolsUtils.js
+++ b/cocos/scripting/javascript/bindings/js/debugger/DevToolsUtils.js
--- a/cocos/scripting/javascript/bindings/js/debugger/README.md
+++ b/cocos/scripting/javascript/bindings/js/debugger/README.md
--- a/cocos/scripting/javascript/bindings/js/debugger/actors/root.js
+++ b/cocos/scripting/javascript/bindings/js/debugger/actors/root.js
--- a/cocos/scripting/javascript/bindings/js/debugger/actors/script.js
+++ b/cocos/scripting/javascript/bindings/js/debugger/actors/script.js
--- a/cocos/scripting/javascript/bindings/js/debugger/core/promise.js
+++ b/cocos/scripting/javascript/bindings/js/debugger/core/promise.js
--- a/cocos/scripting/javascript/bindings/js/debugger/main.js
+++ b/cocos/scripting/javascript/bindings/js/debugger/main.js
--- a/cocos/scripting/javascript/bindings/js/debugger/transport.js
+++ b/cocos/scripting/javascript/bindings/js/debugger/transport.js
--- a/cocos/scripting/javascript/bindings/js/jsb.js
+++ b/cocos/scripting/javascript/bindings/js/jsb.js
--- a/cocos/scripting/javascript/bindings/js/jsb_chipmunk.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_chipmunk.js
--- a/cocos/scripting/javascript/bindings/js/jsb_chipmunk_constants.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_chipmunk_constants.js
--- a/cocos/scripting/javascript/bindings/js/jsb_cocos2d.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_cocos2d.js
--- a/cocos/scripting/javascript/bindings/js/jsb_cocos2d_constants.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_cocos2d_constants.js
--- a/cocos/scripting/javascript/bindings/js/jsb_cocos2d_extension.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_cocos2d_extension.js
--- a/cocos/scripting/javascript/bindings/js/jsb_cocosbuilder.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_cocosbuilder.js
--- a/cocos/scripting/javascript/bindings/js/jsb_debugger.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_debugger.js
--- a/cocos/scripting/javascript/bindings/js/jsb_deprecated.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_deprecated.js
--- a/cocos/scripting/javascript/bindings/js/jsb_opengl.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_opengl.js
--- a/cocos/scripting/javascript/bindings/js/jsb_opengl_constants.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_opengl_constants.js
--- a/cocos/scripting/javascript/bindings/js/jsb_sys.js
+++ b/cocos/scripting/javascript/bindings/js/jsb_sys.js