minggo a5602cc732 merge v3.11 back to v3		2016-05-04 16:02:23 +08:00
..
auto	merge v3.11 back to v3	2016-05-04 16:02:23 +08:00
manual	merge v3.11 back to v3	2016-05-04 16:02:23 +08:00
proj.android	fix the link error and compile error in windows and android platform	2015-12-09 20:18:37 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	Squashed commit of the following:	2016-02-29 13:53:00 -08:00
proj.tizen	Add tizen support (#15518)	2016-04-28 09:49:55 +08:00
proj.win32	Removed unnecessary search paths.	2016-03-22 16:04:12 +08:00
script	fix display.wrapScene()	2016-05-03 21:37:15 +08:00
CMakeLists.txt	Removed unnecessary search paths.	2016-03-22 16:04:12 +08:00