Merge branch 'fix-urls'

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3284b1253c09bdb6682c528d86cd5f823f05ccab..454b2e3ac3b74ecfac12936862d1ed203e993e6d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.o
 tags
+include/loglevels.h
 loglevels.tmp
 *.swp
 *.gcda
@@ -7,11 +8,30 @@ loglevels.tmp
 testcases/testsuite-*
 testcases/latest
 *.output
-*.tab.c
-*.tab.h
+*.tab.*
 *.yy.c
+man/i3-msg.1
+man/i3-msg.xml
+man/i3-msg.html
+man/i3-nagbar.1
+man/i3-nagbar.xml
+man/i3-nagbar.html
+man/i3-wsbar.1
+man/i3-wsbar.xml
+man/i3-wsbar.html
+man/i3-input.1
+man/i3-input.xml
+man/i3-input.html
+man/i3.1
+man/i3.xml
+man/i3.html
 *.tar.bz2*
 i3
 i3-input/i3-input
 i3-nagbar/i3-nagbar
 i3-msg/i3-msg
+i3-config-wizard/i3-config-wizard
+docs/*.html
+docs/*.aux
+docs/*.out
+docs/*.pdf