Merge branch 'master' into next

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index f689147ebc14a94300d3bac3ffeb496872f0d3d6..b641592b9069e8222382d3bd2ca23d512753cf52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,10 @@ loglevels.tmp
 *.gcno
 testcases/testsuite-*
 testcases/latest
-src/*.output
-src/*.tab.*
-src/*.yy.c
+testcases/Makefile
+*.output
+*.tab.*
+*.yy.c
 man/i3-msg.1
 man/i3-msg.xml
 man/i3-msg.html
@@ -19,6 +20,9 @@ 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
@@ -27,3 +31,9 @@ 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