Jonathan G Rennison 9d3b77c5a2 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt

2019-02-02 01:27:56 +00:00

..

ai

Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988)

2019-01-31 23:08:03 +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: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988)

2019-01-31 23:08:03 +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