Merge pull request #29 from lihex/master

update submodule
cocos2d · Mar 4, 2014 · c8a84c1 · c8a84c1
2 parents e9d8126 + 80955a3
commit c8a84c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frameworks/js-bindings/cocos2d-x b/frameworks/js-bindings/cocos2d-x
diff --git a/tools/cocos2d-console b/tools/cocos2d-console
+9 −2		cocos/2d/CCEventDispatcher.cpp
+1 −1		plugin
+4,285 −0		templates/cocos2dx_files.json
+48 −0		templates/cpp-template-default/cpp-template-default.json
+1 −1		tools/cocos2d-console
+54 −12		bin/cocos.py
+0 −18		plugins/project_new/android.json
+0 −4,285		plugins/project_new/cocos_files.json
+0 −253		plugins/project_new/core.py
+19 −0		plugins/project_new/env.json
+0 −12		plugins/project_new/ios_mac.json
+0 −7		plugins/project_new/linux.json
+355 −30		plugins/project_new/project_new.py
+8 −11		plugins/project_new/ui.py
+0 −18		plugins/project_new/win32.json