Jonathan G Rennison 3a640af71d Merge branch 'master' into jgrpp ... # Conflicts: # src/ground_vehicle.cpp # src/viewport.cpp		2018-10-29 18:33:15 +00:00
..
ai	Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation	2018-09-30 20:45:41 +02:00
baseset	Update baseset files	2018-07-26 20:37:20 +01:00
data	Merge branch 'tracerestrict-sx' into jgrpp	2015-08-20 00:39:26 +01:00
game	(svn r27993) -Change: Heading for 1.9 now	2018-03-14 19:36:41 +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