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	674732cd68	Merge: Codechange: Use null pointer literal instead of the NULL macro	2019-04-11 18:14:13 +01:00
patch-import	536a95dfd0	Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch ... https://www.tt-forums.net/viewtopic.php?f=33&t=53394	2015-08-05 21:24:30 +01:00