Merge branch 'master' into next

[i3/i3] / .gitignore

diff --git a/.gitignore b/.gitignore
index efeb48936443475a822c82f59f0e5eb117369437..0160a2467615241286a85a85e66195864de33c8e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,16 @@
 tags
 include/GENERATED_*.h
 include/all.h.pch
+*~
 *.swp
 *.gcda
 *.gcno
 test.commands_parser
 test.config_parser
+testcases/MYMETA.json
+testcases/MYMETA.yml
+testcases/blib/
+testcases/pm_to_blib
 *.output
 *.tab.*
 *.yy.c