aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorVictor Häggqvist <[email protected]>2014-01-23 22:34:06 +0100
committerVictor Häggqvist <[email protected]>2014-01-23 22:34:06 +0100
commit9565d55eaf7a777a2a9d6d448fdc2bc6cfcd45fb (patch)
tree0d2b87e10d381be47919b8ebde0c2690ccef4919 /.gitignore
parent43f59a9737e3f157c707c6868314bbfa77d4a005 (diff)
parentedd9e6670a145e3f41f34c4c6c1cfee44f61a2c7 (diff)
woop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore21
1 files changed, 21 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9ed9d4f..e7fb81d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,24 @@
+<<<<<<< HEAD
# Ignore build generated files
build
+=======
+# Object files
+*.o
+*.ko
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+>>>>>>> edd9e6670a145e3f41f34c4c6c1cfee44f61a2c7