Merge branch 'gitignore'

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index b641592b9069e8222382d3bd2ca23d512753cf52..705314b2a9488932bea9212a4a51e30232ebc2f8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.o
 tags
 include/loglevels.h
+include/GENERATED_*.h
 loglevels.tmp
 *.swp
 *.gcda
@@ -8,6 +9,7 @@ loglevels.tmp
 testcases/testsuite-*
 testcases/latest
 testcases/Makefile
+test.commands_parser
 *.output
 *.tab.*
 *.yy.c
@@ -32,8 +34,6 @@ i3-input/i3-input
 i3-nagbar/i3-nagbar
 i3-msg/i3-msg
 i3-config-wizard/i3-config-wizard
+i3-dump-log/i3-dump-log
 libi3/libi3.a
-docs/*.html
-docs/*.aux
-docs/*.out
 docs/*.pdf