yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXUIImage_win32.cpp cocos2dx/platform/win32/CCXUIImage_win32.h tests/test.win32/test.win32.vcproj		2011-01-28 14:33:47 +08:00
..
android	[android] fixed #321: Frame control of android. It is not so accuracy.	2011-01-22 15:10:18 +08:00
iphone	[iphone] fixed #301, add info.plist for HelloWorld & tests	2011-01-18 12:02:27 +08:00
uphone	[uphone] don't block when zip resources loading failed	2011-01-26 17:08:19 +08:00
win32	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-22 17:52:06 +08:00
AppDelegate.cpp	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-22 17:52:06 +08:00
AppDelegate.h	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00
HelloWorldScene.cpp	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00
HelloWorldScene.h	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00