James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash ... closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.		2014-01-03 18:51:16 -08:00
..
auto-generated@7b3cd31f03	[AUTO] : updating submodule reference to latest autogenerated bindings	2014-01-04 01:40:17 +00:00
javascript	Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash	2014-01-03 18:51:16 -08:00
lua	closed #3579: Bug fix in setTouchEnabledForLayer for luabindings.	2014-01-04 10:30:11 +08:00
CMakeLists.txt	Resolve the android and linux compile error	2014-01-03 11:15:46 +08:00