Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h

2019-11-12 18:43:10 +00:00

50 KiB

Raw Blame History

View Raw