James Chen 2c0cc603d1 Merge branch 'master' into develop ... Conflicts: extensions/cocos-ext.h		2013-06-18 10:46:25 +08:00
..
ArmatureScene.cpp	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
ArmatureScene.h	Template fix for iOS Template.	2013-06-17 15:54:12 +08:00