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
..
ai	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
baseset	Feature: Add NotRoadTypes (NRT)	2019-05-01 21:36:27 +02:00
data	Merge branch 'tracerestrict-sx' into jgrpp	2015-08-20 00:39:26 +01:00
game	Cleanup: Removed SVN headers	2019-11-10 17:59:20 +00:00
scripts	(svn r15302) -Add: example file for on_server_connect.scr and document it in the scripts readme	2009-01-31 23:50:53 +00:00