Christoph Oelckers ba5b8b3d6f Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven ... # Conflicts: # source/core/gameinput.h		2021-04-19 13:11:41 +02:00
..
joystickmenu.cpp	- move most of the menu code into the backend.	2020-10-04 21:57:35 +02:00
menu.cpp	- backend update from GZDoom.	2021-01-29 13:20:00 +01:00
menu.h	- backend update.	2020-10-28 21:46:43 +01:00
menudef.cpp	Merge branch 'master' into witchaven2	2021-01-01 17:32:32 +11:00
menustate.h	- updated the platform code to be mostly identical with GZDoom	2020-05-26 00:08:26 +02:00
messagebox.cpp	- move most of the menu code into the backend.	2020-10-04 21:57:35 +02:00
optionmenu.cpp	- move most of the menu code into the backend.	2020-10-04 21:57:35 +02:00
resolutionmenu.cpp	- move most of the menu code into the backend.	2020-10-04 21:57:35 +02:00
savegamemanager.cpp	- delete the "New savegame" node before starting work on the savegame.	2021-04-19 12:48:06 +02:00
savegamemanager.h	- get load and save game menus and related CCMDs working again.	2020-10-07 18:32:57 +02:00