summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2006-05-22 10:42:24 -0700
committerEric Anholt <anholt@FreeBSD.org>2006-05-22 10:42:24 -0700
commitc1c46f882f9a11c383c8d1d1ce393be8fda55ed0 (patch)
tree6272cf9017a205eea2f6005b1970d20c87f301da /.gitignore
parent1e2da2450d7213c0aa4d4bd1fba5723dcda13ddf (diff)
parentf2967a2f5f47b636b2445fa69dbc3ec79e065c90 (diff)
Merge branch 'master' into modesetting
Conflicts: man/.gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 094379b3..b13e38f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
Makefile
Makefile.in
*.la