EmulationStation-retropie/es-core
Aloshi 7635f11f92 Merge branch 'master' into gamelistdb
Conflicts:
	es-app/src/guis/GuiGamelistOptions.cpp
2015-03-05 20:11:44 -06:00
..
src Merge branch 'master' into gamelistdb 2015-03-05 20:11:44 -06:00
CMakeLists.txt Removed some unused Renderer functions (onInit, onDeinit). 2015-03-03 16:36:21 -06:00