yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: extensions/Android.mk extensions/proj.win32/libExtensions.vcxproj.filters samples/Cpp/TestCpp/Android.mk samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp		2013-06-06 12:35:18 +08:00
..
Images	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
Misc	issue #1683: Adding FileUtilsTest.	2013-01-28 15:17:20 +08:00
Shaders	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
TileMaps	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
animations	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
armature	1.upload CCArmature	2013-06-06 12:02:54 +08:00
ccb	fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.	2013-03-19 16:33:23 +08:00
extensions	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
fonts	Added example for russian language in TestCpp / LabelTest / BMFontUnicode.	2013-05-04 15:28:24 +03:00
hd	issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.	2013-04-24 13:57:34 +08:00
ipad	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
.gitignore	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
Hello.png.REMOVED.git-id	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
app.icf	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
background-music-aac.wav.REMOVED.git-id	1. add Component struct.	2013-06-04 17:38:43 +08:00
background.mp3.REMOVED.git-id	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
development.icf	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00