Merge branch 'master' into next

3d5ac40d · Monster Iestyn · 20351a10 · 4008cae5 · 3d5ac40d · 3d5ac40d
Commit 3d5ac40d authored 8 years ago by Monster Iestyn
--- a/objs/DC/SDL/Debug/.gitignore
+++ b/objs/DC/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/DC/SDL/Release/.gitignore
+++ b/objs/DC/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Linux/SDL/Debug/.gitignore
+++ b/objs/Linux/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Linux/SDL/Release/.gitignore
+++ b/objs/Linux/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Linux64/SDL/Debug/.gitignore
+++ b/objs/Linux64/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Linux64/SDL/Release/.gitignore
+++ b/objs/Linux64/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw/Debug/.gitignore
+++ b/objs/Mingw/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw/Release/.gitignore
+++ b/objs/Mingw/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw/SDL/Debug/.gitignore
+++ b/objs/Mingw/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw/SDL/Release/.gitignore
+++ b/objs/Mingw/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw64/Debug/.gitignore
+++ b/objs/Mingw64/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw64/Release/.gitignore
+++ b/objs/Mingw64/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw64/SDL/Debug/.gitignore
+++ b/objs/Mingw64/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/Mingw64/SDL/Release/.gitignore
+++ b/objs/Mingw64/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/PS3/SDL/Debug/.gitignore
+++ b/objs/PS3/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/PS3/SDL/Release/.gitignore
+++ b/objs/PS3/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/PSP/SDL/Release/.gitignore
+++ b/objs/PSP/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/SDL/Release/.gitignore
+++ b/objs/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/VC/.gitignore
+++ b/objs/VC/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/objs/VC9/.gitignore
+++ b/objs/VC9/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing