Merge branch 'master' into next

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index 454b2e3ac3b74ecfac12936862d1ed203e993e6d..b641592b9069e8222382d3bd2ca23d512753cf52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ loglevels.tmp
 *.gcno
 testcases/testsuite-*
 testcases/latest
+testcases/Makefile
 *.output
 *.tab.*
 *.yy.c
@@ -31,6 +32,7 @@ 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