Jonathan G Rennison ddf31702a2 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h

2019-01-31 18:19:45 +00:00

..

ai

Fix: make -k switch useful when testing regression (#7053)

2019-01-13 07:40:54 +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

(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