James Chen 2c0cc603d1 Merge branch 'master' into develop ... Conflicts: extensions/cocos-ext.h		2013-06-18 10:46:25 +08:00
..
Cpp	Merge branch 'master' into develop	2013-06-18 10:46:25 +08:00
Javascript	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
Lua	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00