Commit Graph

3 Commits (99d11c482a3293274a5e21c2e37ebad7565500d2)

Author SHA1 Message Date
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
5 years ago
Jonathan G Rennison 6c546a2145 Add include for scope header file 6 years ago
Jonathan G Rennison 6e9ea59ab5 Add a simple scope guard include file. 8 years ago