Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 …

…into CCGame_dev3.0 Conflicts: HelloHTML5World/main.js
cocos2d · Mar 6, 2014 · 59ba20a · 59ba20a
2 parents 72fe8fd + 927b055
commit 59ba20a
Show file tree

Hide file tree

Showing 55 changed files with 185 additions and 1,194 deletions.
diff --git a/HelloHTML5World/build.xml b/HelloHTML5World/build.xml
diff --git a/HelloHTML5World/index.html b/HelloHTML5World/index.html
diff --git a/HelloHTML5World/main.js b/HelloHTML5World/main.js
diff --git a/HelloHTML5World/project.json b/HelloHTML5World/project.json
diff --git a/HelloHTML5World/res/CloseNormal.png b/HelloHTML5World/res/CloseNormal.png
diff --git a/HelloHTML5World/res/CloseSelected.png b/HelloHTML5World/res/CloseSelected.png
diff --git a/HelloHTML5World/res/HelloWorld.png b/HelloHTML5World/res/HelloWorld.png
diff --git a/HelloHTML5World/res/favicon.ico b/HelloHTML5World/res/favicon.ico
diff --git a/HelloHTML5World/src/myApp.js b/HelloHTML5World/src/myApp.js
diff --git a/HelloHTML5World/src/resource.js b/HelloHTML5World/src/resource.js
diff --git a/HelloHTML5World/tools/genBuildXml.js b/HelloHTML5World/tools/genBuildXml.js