samuele3hu c553fd2b73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI		2014-01-07 10:10:17 +08:00
..
auto-generated@f3d5f69b7b	[AUTO] : updating submodule reference to latest autogenerated bindings	2014-01-05 10:43:05 +00:00
javascript	Warning fix in js_manual_conversions.cpp/h	2014-01-06 20:02:01 +08:00
lua	Fix:Resolve the release lua test sample compile error	2014-01-07 10:08:58 +08:00
CMakeLists.txt	Resolve the android and linux compile error	2014-01-03 11:15:46 +08:00