2 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
patch-import	ee791055f9	Import infrastructure sharing patch ... Strip trailing whitespace Remove a leftover line form settings.ini http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843	2015-08-06 22:24:28 +01:00