Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/template
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
..
multi-platform-cpp Merge branch 'develop' into glview_improvements 2014-01-27 10:52:35 -08:00
multi-platform-js Merge branch 'develop' into glview_improvements 2014-01-27 10:52:35 -08:00
multi-platform-lua Merge branch 'develop' into glview_improvements 2014-01-27 10:52:35 -08:00