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

# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp

2017-03-12 20:37:26 +00:00

..

macosx

(svn r27675) -Fix [FS#6502]: [OSX] Building with 10.11 or 10.12 SDKs.

2016-10-31 19:29:01 +00:00

os2

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

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

unix

Merge branch 'cpp-11' into crashlog_improvements

2016-09-08 19:36:00 +01:00

windows

Merge branch 'master' into jgrpp

2017-03-12 20:37:26 +00:00