Jonathan G Rennison 0d93ecb6bf Merge branch 'master' into jgrpp ... # Conflicts: # src/core/alloc_type.hpp # src/group_gui.cpp # src/newgrf.cpp # src/saveload/economy_sl.cpp # src/saveload/map_sl.cpp # src/station_cmd.cpp		2019-04-16 18:03:08 +01:00
..
ai	Fix: Industry coverage area is no longer rectangular. (#7464)	2019-04-13 14:27:57 +01: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	(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