commit f27269f7a8a9230c59283cb824ab130226a2101c
Merge: c6a63b62 5e3314dd
Author:     Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Tue Mar 21 17:12:45 2017 +0000
Commit:     Jonathan Dowland <jon+github@alcopop.org>
CommitDate: Tue Mar 21 17:12:45 2017 +0000

    Merge branch 'joystick-allow-savegames' into sdl2-branch

 src/doom/m_menu.c | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)