aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJoshua Randall2014-10-30 22:44:45 +0000
committerJoshua Randall2014-10-30 22:44:45 +0000
commit770a817bcf954f9550fef4d6871db4c81564da7a (patch)
tree1d233498e1ca2fc64cd74898bfb9b9f04dcd18ae /.gitignore
parent9a5eeda5bd2017ac5cc03893b4955cc993307f05 (diff)
parent587e0a464328110766c2e26ad2093f44c9dffa80 (diff)
downloadpangemma-770a817bcf954f9550fef4d6871db4c81564da7a.tar.gz
Merge branch 'master' into fix-make-clean-bins
Conflicts: Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e69de29..7ee1240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.gitignore
+*.o
+*.tar.gz
+bin/