natural-law acb4bb5a16 Merge branch 'master' into iss428 ... Conflicts: template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj		2011-04-21 14:58:58 +08:00
..
TemplateIcon.icns	[ios] rename template/ios_mac folder to template/xcode3 folder. Get ready for xcode4 templates	2011-03-15 15:57:36 +08:00
project.pbxproj.REMOVED.git-id	Merge branch 'master' into iss428	2011-04-21 14:58:58 +08:00