Merge branch 'master' into next

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index d1555b0d36b06a98dc772877c080f6fa0754d555..b641592b9069e8222382d3bd2ca23d512753cf52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,39 @@
 *.o
 tags
+include/loglevels.h
 loglevels.tmp
 *.swp
+*.gcda
+*.gcno
 testcases/testsuite-*
 testcases/latest
+testcases/Makefile
 *.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
+libi3/libi3.a
+docs/*.html
+docs/*.aux
+docs/*.out
+docs/*.pdf