James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master		2013-06-14 15:41:01 +08:00
..
javascript	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-06-14 06:24:17 +00:00
lua	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00