James Chen 2c0cc603d1 Merge branch 'master' into develop ... Conflicts: extensions/cocos-ext.h		2013-06-18 10:46:25 +08:00
..
base_ios.xctemplate	update xcode template and version string	2012-11-01 12:06:15 +08:00
cocos2dx.xctemplate	fix some errors of xcode template	2013-01-28 22:35:38 +08:00
cocos2dx_box2d.xctemplate	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
cocos2dx_chipmunk.xctemplate	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
cocos2dx_js.xctemplate	Updating iOS template.	2013-05-20 21:06:37 +08:00
cocos2dx_lua.xctemplate	fixed #2084:add lua loader for all platforms	2013-04-26 12:12:19 +08:00
lib_cocos2dx.xctemplate	Merge branch 'master' into develop	2013-06-18 10:46:25 +08:00