natural-law 60e9ae873c Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 ... Conflicts: HelloWorld/AppDelegate.cpp tests/AppDelegate.cpp		2011-02-19 10:19:14 +08:00
..
CCPVRTexture.cpp	issue #289, fix some warnings	2011-01-17 21:16:25 +08:00
CCTexture2D.cpp	[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.	2011-02-17 14:31:52 +08:00
CCTextureAtlas.cpp	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-19 15:29:08 +08:00
CCTextureCache.cpp	Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316	2011-02-19 10:19:14 +08:00