Jonathan G Rennison 7ff252c58d Merge branch 'master' into jgrpp ... # Conflicts: # Makefile.src.in # findversion.sh # projects/determineversion.vbs # src/aircraft_cmd.cpp # src/lang/dutch.txt # src/linkgraph/linkgraph_gui.cpp # src/linkgraph/linkgraph_gui.h # src/order_cmd.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/town_cmd.cpp # src/viewport.cpp # src/water_map.h		2019-03-04 01:18:25 +00:00
..
ai	Change: Heading for 1.10 now (#7319)	2019-03-03 20:51: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