Christoph Oelckers 1e5fbc1423 Merge remote-tracking branch 'remotes/origin/master' into 2D_Refactor ... # Conflicts: # src/posix/cocoa/i_video.mm		2018-03-30 22:06:17 +02:00
..
joystickmenu.cpp	- moved the VM types into their own file and only include it where really needed.	2017-04-13 01:12:04 +02:00
loadsavemenu.cpp	- renamed FileRdr back to FileReader.	2018-03-11 19:29:37 +01:00
menu.cpp	- it compiles again.	2018-03-28 16:40:09 +02:00
menu.h	- use FileRdr in the PNG code, in particular to sanitize the savepic handling.	2018-03-10 19:22:26 +01:00
menudef.cpp	Attempt to fix a blank banks list of ADLMIDI	2018-03-29 23:39:15 -04:00
messagebox.cpp	Stop demo recording after ending game with menu_endgame CCMD	2017-12-15 12:34:56 +02:00
optionmenu.cpp	- cleaned out some cruft from the menu code, now that ListMenu is fully scripted.	2017-02-18 19:11:53 +01:00
playermenu.cpp	- moved the VM types into their own file and only include it where really needed.	2017-04-13 01:12:04 +02:00
videomenu.cpp	- fixed compilation in debug mode.	2017-11-12 09:06:40 +01:00