Merge branch 'next' into public_next

This commit is contained in:
Monster Iestyn 2017-05-03 19:40:49 +01:00
commit 89af58de4c
30 changed files with 14 additions and 59 deletions

View file

@ -1,3 +1,3 @@
/srb2sdl.exe
/srb2win.exe
/r_opengl.dll
*.exe
*.mo
r_opengl.dll

View file

@ -1,3 +1,3 @@
/srb2sdl.exe
/srb2win.exe
/r_opengl.dll
*.exe
*.mo
r_opengl.dll

8
objs/.gitignore vendored Normal file
View file

@ -0,0 +1,8 @@
#All folders
SRB2.res
depend.dep
depend.ped
*.o
#VC9 folder only
/VC9/Win32
/VC9/x64

View file

@ -1 +0,0 @@
/depend.dep

View file

@ -1 +0,0 @@
/depend.dep

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,3 +0,0 @@
/SRB2.res
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1 +0,0 @@
/depend.dep

View file

@ -1 +0,0 @@
/depend.ped

0
objs/VC/.gitignore vendored
View file

2
objs/VC9/.gitignore vendored
View file

@ -1,2 +0,0 @@
/Win32
/x64

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1 +0,0 @@
/depend.dep

View file

@ -1 +0,0 @@
/depend.dep

View file

@ -1 +0,0 @@
/depend.dep

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o

View file

@ -1,2 +0,0 @@
/depend.dep
/*.o