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)
commite41ff515201a4fd784f58c61e49b6beeb7990a09
tree4344b52de0e5901b0b9df4a0307f31aa248054b1
parentbd115e9be41dadd082e5bc8d4dfcf35a2ce869a5
parent78d254094cf2c238a930719dfd20fcbd309abde5
Merge branch 'feature/gens-sdl-popt'

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.)
src/gens-sdl/EmuLoop.cpp
src/gens-sdl/EventLoop.cpp
src/gens-sdl/EventLoop_p.hpp