James Chen a4a010465c Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071		2014-01-26 16:41:35 +08:00
..
auto-generated@d64b32c638	[AUTO] : updating submodule reference to latest autogenerated bindings	2014-01-26 08:30:04 +00:00
javascript	Fix a typo, this._is_nativeObj -> this.__nativeObj.	2014-01-26 14:45:45 +08:00
lua	Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071	2014-01-26 16:41:35 +08:00
CMakeLists.txt	Merge pull request #4956 from dumganhar/move-temp-obj	2014-01-06 23:58:42 -08:00