Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol

d1700bbf · katsy · d6eaf7e0 · df9b5c43 · d1700bbf · d1700bbf
Commit d1700bbf authored 3 years ago by katsy
--- a/dep/.gitignore
+++ b/dep/.gitignore
+#All folders
+*.d
--- a/dep/FreeBSD/SDL/Debug/.gitignore
+++ b/dep/FreeBSD/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/FreeBSD/SDL/Release/.gitignore
+++ b/dep/FreeBSD/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Linux/SDL/Debug/.gitignore
+++ b/dep/Linux/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Linux/SDL/Release/.gitignore
+++ b/dep/Linux/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Linux64/SDL/Debug/.gitignore
+++ b/dep/Linux64/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Linux64/SDL/Release/.gitignore
+++ b/dep/Linux64/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/MasterClient/.gitignore
+++ b/dep/MasterClient/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/MasterServer/.gitignore
+++ b/dep/MasterServer/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw/Debug/.gitignore
+++ b/dep/Mingw/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw/Release/.gitignore
+++ b/dep/Mingw/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw/SDL/Debug/.gitignore
+++ b/dep/Mingw/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw/SDL/Release/.gitignore
+++ b/dep/Mingw/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw64/Debug/.gitignore
+++ b/dep/Mingw64/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw64/Release/.gitignore
+++ b/dep/Mingw64/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw64/SDL/Debug/.gitignore
+++ b/dep/Mingw64/SDL/Debug/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/Mingw64/SDL/Release/.gitignore
+++ b/dep/Mingw64/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/SDL/Release/.gitignore
+++ b/dep/SDL/Release/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/VC/.gitignore
+++ b/dep/VC/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing
--- a/dep/VC9/.gitignore
+++ b/dep/VC9/.gitignore
+# DON'T REMOVE
+# This keeps the folder from disappearing