natural-law e38d3a2277 Merge branch 'master' into iss434 ... Conflicts: cocos2dx/platform/airplay/CCFileUtils_airplay.h 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		2011-03-28 17:06:32 +08:00
..
android	[android] fixed #421: create project ok on linux	2011-03-24 09:37:56 +08:00
msvc	fixed #395 Add initInstance code for all platform in msvc templates.	2011-03-17 11:27:51 +08:00
xcode3	Merge branch 'master' into iss434	2011-03-28 17:06:32 +08:00