Jonathan G Rennison 58433c7667 Merge branch 'master' into jgrpp ... # Conflicts: # src/core/smallmap_type.hpp # src/lang/korean.txt # src/network/network_content.cpp # src/smallmap_gui.cpp # src/station_cmd.cpp		2019-03-30 20:45:58 +00:00
..
ai	Fix: Incorrect display of industry production around tiles. (#7426)	2019-03-27 23:10:02 +00:00
baseset	Feature: Group liveries, and livery window usability enhancements. (#7108)	2019-01-31 14:57:44 +01:00
data	Merge branch 'tracerestrict-sx' into jgrpp	2015-08-20 00:39:26 +01:00
game	Change: Heading for 1.10 now (#7319)	2019-03-03 20:51:57 +01:00
scripts