Cleanup merge issues
Jeffrey Pfau jeffrey@endrift.com
Sun, 20 Jul 2014 21:28:25 -0700
1 files changed,
0 insertions(+),
2 deletions(-)
jump to
M
src/platform/sdl/sdl-events.h
→
src/platform/sdl/sdl-events.h
@@ -23,6 +23,4 @@ void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLEvents* sdlContext, const union SDL_Event* event);
enum GBAKey GBASDLMapButtonToKey(int button); -enum GBAKey GBASDLMapButtonToKey(int button); - #endif