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

# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp

2018-05-03 23:54:51 +01:00

..

macosx

Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

2018-04-27 02:42:20 +01:00

os2

(svn r27643) -Codechange: FiosGetDrives function also takes a destination file list.

2016-09-04 12:54:30 +00:00

unix

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00

windows

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00