yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: HelloWorld/AppDelegate.cpp cocos2dx/particle_nodes/CCParticleSystem.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj tests/AppDelegate.cpp		2011-01-20 11:18:35 +08:00
..
android	fixed #309,App will not crash any more when surface re-created.	2011-01-10 17:54:44 +08:00
iphone	[iphone] fixed #301, add info.plist for HelloWorld & tests	2011-01-18 12:02:27 +08:00
uphone	[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.	2011-01-19 18:02:35 +08:00
win32	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-20 11:18:35 +08:00
AppDelegate.cpp	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-20 11:18:35 +08:00
AppDelegate.h	fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android	2010-11-27 18:25:31 +08:00
HelloWorldScene.cpp	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-01-18 12:00:09 +08:00
HelloWorldScene.h	fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android	2010-11-27 18:25:31 +08:00