summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-04-28 14:35:11 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-04-28 14:35:11 +0930
commitd68d321c0692848dd5eb67a3713676498c1c646b (patch)
tree5863ae7337d24ad2a628dc6e6e4cba88641a9dad /.gitignore
parent7d0977bc02ce4f29c0ed335fcdcce4ed7c328259 (diff)
parent3e99cc281509c70c9240e71ae55cf4e62c6569ba (diff)
Merge branch 'master' into mpx
Conflicts: .gitignore man/XGrabDeviceKey.man man/XListInputDevices.man
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index fe49f15..1352d4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ missing
mkinstalldirs
xi.pc
man/*.man
+*~