Merge branch 'master' into next

ea372fae · Monster Iestyn · 6c18d15b · c90ddbca · ea372fae · ea372fae
Commit ea372fae authored 7 years ago by Monster Iestyn
--- a/bin/WinCE/MIPSIVRel/.gitignore
+++ b/bin/WinCE/MIPSIVRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIV_FPDbg/.gitignore
+++ b/bin/WinCE/MIPSIV_FPDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIV_FPRel/.gitignore
+++ b/bin/WinCE/MIPSIV_FPRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/Release/.gitignore
+++ b/bin/WinCE/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/SH3Dbg/.gitignore
+++ b/bin/WinCE/SH3Dbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/SH3Rel/.gitignore
+++ b/bin/WinCE/SH3Rel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/SH4Dbg/.gitignore
+++ b/bin/WinCE/SH4Dbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/SH4Rel/.gitignore
+++ b/bin/WinCE/SH4Rel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/X86Dbg/.gitignore
+++ b/bin/WinCE/X86Dbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/X86Rel/.gitignore
+++ b/bin/WinCE/X86Rel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/emulatorDbg/.gitignore
+++ b/bin/WinCE/emulatorDbg/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/WinCE/emulatorRel/.gitignore
+++ b/bin/WinCE/emulatorRel/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/bin/dummy/.gitignore
+++ b/bin/dummy/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/FreeBSD/SDL/Debug/.gitignore
+++ b/objs/FreeBSD/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/FreeBSD/SDL/Release/.gitignore
+++ b/objs/FreeBSD/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/MasterClient/.gitignore
+++ b/objs/MasterClient/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/MasterServer/.gitignore
+++ b/objs/MasterServer/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/XBOX/SDL/Debug/.gitignore
+++ b/objs/XBOX/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/XBOX/SDL/Release/.gitignore
+++ b/objs/XBOX/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/cygwin/Debug/.gitignore
+++ b/objs/cygwin/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing