Merge branch 'master' into next

2017-05-03 19:37:55 +01:00 · 2017-05-03 19:37:55 +01:00 · 20351a103e
parent 18fa73ba05 30143d2e25
commit 20351a103e
30 changed files with 14 additions and 59 deletions
--- a/bin/Mingw/Debug/.gitignore
+++ b/bin/Mingw/Debug/.gitignore
@ -1,3 +1,3 @@
-/srb2sdl.exe
-/srb2win.exe
-/r_opengl.dll
+*.exe
+*.mo
+r_opengl.dll
--- a/bin/Mingw/Release/.gitignore
+++ b/bin/Mingw/Release/.gitignore
@ -1,3 +1,3 @@
-/srb2sdl.exe
-/srb2win.exe
-/r_opengl.dll
+*.exe
+*.mo
+r_opengl.dll
--- a/objs/.gitignore
+++ b/objs/.gitignore
@ -0,0 +1,8 @@
+#All folders
+SRB2.res
+depend.dep
+depend.ped
+*.o
+#VC9 folder only
+/VC9/Win32
+/VC9/x64
--- a/objs/DC/SDL/Debug/.gitignore
+++ b/objs/DC/SDL/Debug/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/DC/SDL/Release/.gitignore
+++ b/objs/DC/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/Linux/SDL/Debug/.gitignore
+++ b/objs/Linux/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Linux/SDL/Release/.gitignore
+++ b/objs/Linux/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Linux64/SDL/Debug/.gitignore
+++ b/objs/Linux64/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Linux64/SDL/Release/.gitignore
+++ b/objs/Linux64/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Mingw/Debug/.gitignore
+++ b/objs/Mingw/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw/Release/.gitignore
+++ b/objs/Mingw/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw/SDL/Debug/.gitignore
+++ b/objs/Mingw/SDL/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw/SDL/Release/.gitignore
+++ b/objs/Mingw/SDL/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/Debug/.gitignore
+++ b/objs/Mingw64/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/Release/.gitignore
+++ b/objs/Mingw64/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/SDL/Debug/.gitignore
+++ b/objs/Mingw64/SDL/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/SDL/Release/.gitignore
+++ b/objs/Mingw64/SDL/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/PS3/SDL/Debug/.gitignore
+++ b/objs/PS3/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/PS3/SDL/Release/.gitignore
+++ b/objs/PS3/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/PSP/SDL/Release/.gitignore
+++ b/objs/PSP/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/SDL/Release/.gitignore
+++ b/objs/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.ped
--- a/objs/VC/.gitignore
+++ b/objs/VC/.gitignore
--- a/objs/VC9/.gitignore
+++ b/objs/VC9/.gitignore
@ -1,2 +0,0 @@
-/Win32
-/x64
--- a/objs/Wii/SDL/Debug/.gitignore
+++ b/objs/Wii/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Wii/SDL/Release/.gitignore
+++ b/objs/Wii/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/WinCE/SDL/Release/.gitignore
+++ b/objs/WinCE/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/djgppdos/Debug/.gitignore
+++ b/objs/djgppdos/Debug/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/djgppdos/Release/.gitignore
+++ b/objs/djgppdos/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/nds/Debug/.gitignore
+++ b/objs/nds/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/nds/Release/.gitignore
+++ b/objs/nds/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o