Skip to content
Snippets Groups Projects
Commit 30143d2e authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'gitignore-stuff' into 'master'

.gitignore stuff

The following changes have been made to `.gitignore` files in the objs/ and bin/ folders:
* All the `.gitignore`s living in subfolders of objs/ have been done away with and replaced with a single `objs/.gitignore`, covering all the things that the subfolders ignored before (including depend.ped, if anyone is like me and has to remove that file manually)
* All the `.gitignore`s living in subfolders of `bin/Mingw` ignore .exes of any name, not just srb2win/srb2dd/srb2sdl. en.mo is also ignored now... or rather any .mo file (just in case). This is mostly for my own sanity and that of anyone else who uses EXENAME=[name.exe] when compiling with MinGW.

If you're not sure what `.gitignore` does exactly, as far as I'm aware it literally just tells Git what to "ignore" (or rather, not track), so anyone using Git GUI or some other Git program etc doesn't have to see changes certain files and can't accidentally commit the files or whatever.

See merge request !174
parents 7658469c d7a216e1
No related branches found
No related tags found
No related merge requests found
Showing
with 14 additions and 45 deletions
/srb2sdl.exe
/srb2win.exe
/r_opengl.dll
*.exe
*.mo
r_opengl.dll
/srb2sdl.exe
/srb2win.exe
/r_opengl.dll
*.exe
*.mo
r_opengl.dll
#All folders
SRB2.res
depend.dep
depend.ped
*.o
#VC9 folder only
/VC9/Win32
/VC9/x64
/depend.dep
/depend.dep
/depend.dep
/*.o
/depend.dep
/*.o
/depend.dep
/*.o
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/SRB2.res
/depend.dep
/*.o
/depend.dep
/*.o
/depend.dep
/*.o
/depend.dep
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment