Merge branch 'feature/gens-sdl-popt'
authorDavid Korth <gerbilsoft@gerbilsoft.com>
Sat, 12 Sep 2015 16:53:09 +0000 (12:53 -0400)
committerDavid Korth <gerbilsoft@gerbilsoft.com>
Sat, 12 Sep 2015 16:53:09 +0000 (12:53 -0400)
Note that the --fps option doesn't do anything, since gens-sdl's OSD
doesn't have an FPS counter yet. (The title bar FPS counter will be
removed once that's implemented.)

1  2 
src/gens-sdl/EmuLoop.cpp
src/gens-sdl/EventLoop.cpp
src/gens-sdl/EventLoop_p.hpp

Simple merge
Simple merge
Simple merge