Jonathan G Rennison 281d346fe2 Merge branch 'master' into jgrpp ... # Conflicts: # bin/baseset/no_sound.obs # bin/baseset/orig_dos.obg # bin/baseset/orig_dos.obs # bin/baseset/orig_dos_de.obg # bin/baseset/orig_win.obg # bin/baseset/orig_win.obm # bin/baseset/orig_win.obs # src/aircraft_cmd.cpp # src/blitter/32bpp_anim.cpp # src/blitter/32bpp_anim.hpp # src/blitter/32bpp_base.cpp # src/blitter/32bpp_base.hpp # src/blitter/8bpp_base.cpp # src/blitter/8bpp_base.hpp # src/blitter/common.hpp # src/group_gui.cpp # src/lang/korean.txt # src/linkgraph/linkgraph_gui.cpp # src/saveload/saveload.cpp # src/town_cmd.cpp # src/viewport.cpp # src/viewport_func.h		2019-01-29 02:28:14 +00:00
..
ai	Fix: make -k switch useful when testing regression (#7053)	2019-01-13 07:40:54 +00:00
baseset	Change: Always build baseset metadata, instead of including it in the repo.	2019-01-25 22:28:39 +00: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