Merge branch 'master' into next

ea372fae · Monster Iestyn · 6c18d15b · c90ddbca · ea372fae · ea372fae
Commit ea372fae authored 7 years ago by Monster Iestyn
--- a/bin/DC/.gitignore
+++ b/bin/DC/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/Dos/Debug/.gitignore
+++ b/bin/Dos/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/Dos/Release/.gitignore
+++ b/bin/Dos/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/FreeBSD/Debug/.gitignore
+++ b/bin/FreeBSD/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/FreeBSD/Release/.gitignore
+++ b/bin/FreeBSD/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/SDL/Debug/.gitignore
+++ b/bin/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/SDL/Release/.gitignore
+++ b/bin/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4Dbg/.gitignore
+++ b/bin/WinCE/ARMV4Dbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4IDbg/.gitignore
+++ b/bin/WinCE/ARMV4IDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4IRel/.gitignore
+++ b/bin/WinCE/ARMV4IRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4Rel/.gitignore
+++ b/bin/WinCE/ARMV4Rel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4TDbg/.gitignore
+++ b/bin/WinCE/ARMV4TDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4TRel/.gitignore
+++ b/bin/WinCE/ARMV4TRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPS16Dbg/.gitignore
+++ b/bin/WinCE/MIPS16Dbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPS16Rel/.gitignore
+++ b/bin/WinCE/MIPS16Rel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIIDbg/.gitignore
+++ b/bin/WinCE/MIPSIIDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIIRel/.gitignore
+++ b/bin/WinCE/MIPSIIRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSII_FPDbg/.gitignore
+++ b/bin/WinCE/MIPSII_FPDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSII_FPRel/.gitignore
+++ b/bin/WinCE/MIPSII_FPRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIVDbg/.gitignore
+++ b/bin/WinCE/MIPSIVDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing