Merge branch 'master' into TeamCMU

2017-11-18 10:24:34 +01:00
parent 46dbdd5ed5
commit beb1404b86
2 changed files with 32 additions and 0 deletions
--- a/..gitignore.swp
+++ b/..gitignore.swp
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app