Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/template/multi-platform-js
History
Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements 
Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
 		2014-01-27 10:52:35 -08:00
..
Classes Merge branch 'develop' into glview_improvements 2014-01-27 10:52:35 -08:00
Resources rename jsb boot file. 2013-11-07 23:51:01 +08:00
proj.android fix get_num_of_cpu on win32. 2014-01-24 18:30:37 +08:00
proj.ios_mac Fixes couldn't find CCEGLView.h in main.cpp of template. 2014-01-23 18:15:02 +08:00
proj.win32 Fixes couldn't find CCEGLView.h in main.cpp of template. 2014-01-23 18:15:02 +08:00