Skip to content

Commit

Permalink
Merge branch 'master' of github.com:geron-cn/CocoStudioSamplesBasedOn…
Browse files Browse the repository at this point in the history 
…Cocos2d-x3.0
  • Loading branch information
@young40
young40 committed Mar 14, 2014
2 parents 138a662 + 0ab2fc3 commit e5e95c2
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 17 deletions.
12 changes: 11 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,14 @@ tools/tojs/user.cfg
tools/tojs/userconf.ini
# ... userconf.ini generated if running from tools/jenkins_scripts/mac/android/
tools/jenkins_scripts/mac/android/userconf.ini
*/cocos2d/*
*/cocos2d/AUTHORS
*/cocos2d/build
*/cocos2d/CHANGELOG
*/cocos2d/CMakeLists.txt
*/cocos2d/cocos
*/cocos2d/docs
*/cocos2d/extensions
*/cocos2d/external
*/cocos2d/licenses
*/cocos2d/plugin
*/cocos2d/tools
2 changes: 1 addition & 1 deletion DemoBag/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion DemoCowboyGame/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion DemoFishingJoy/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion DemoGameScene/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion DemoLogin/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion DemoMap/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion DemoShop/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleChangeEquip/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleFlashImport/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleFrameAnimation/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleHelloUI/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleImageViewer/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleKeyFrameAnimation/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleParticle/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleSceneEditor/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …
2 changes: 1 addition & 1 deletion SampleUIAnimation/cocos2d/readme
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
put cocos2d here what in a project created by create_project.py
put cocos2d here what in a project created by cocos new …

0 comments on commit e5e95c2

Please sign in to comment.