axmol/HelloWorld/ios
natural-law 1991a65b0b Merge branch 'master' into iss391
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
2011-03-29 10:20:57 +08:00
..
HelloWorld.xcodeproj Merge branch 'master' into iss391 2011-03-29 10:20:57 +08:00
AppController.h Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
AppController.mm [ios]fix #419,Enable the depth test when EAGLView is created. 2011-03-21 17:15:20 +08:00
HelloWorld_Prefix.pch Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00