Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop ... udpate copyrights for the new year 2014 and Chukong.		2014-01-06 19:50:18 -08:00
..
auto-generated@db7c5b9d77	[AUTO] : updating submodule reference to latest autogenerated bindings	2014-01-07 03:25:39 +00:00
javascript	Warning fix in js_manual_conversions.cpp/h	2014-01-06 20:02:01 +08:00
lua	Merge pull request #4947 from walzer/develop	2014-01-06 19:50:18 -08:00
CMakeLists.txt	Resolve the android and linux compile error	2014-01-03 11:15:46 +08:00