Commit Graph

3 Commits

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
2019-11-12 18:43:10 +00:00
Jonathan G Rennison
2fb822d392 Fix includes and header guards of container functions. 2017-03-29 19:39:55 +01:00
Jonathan G Rennison
ea2b04a6be Add C++11 container utility functions. 2016-09-10 00:55:13 +01:00