Merge branch 'packer/cached-converter' into 'master'

[xonotic/xonotic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 80dbc48a9446f984ff44c1b4b174afba60ad88ef..ab43afbbdc6d7046ab40283c8bf70dd584cfea1e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+/build/
+/daemon
 /darkplaces
-/fteqcc
+/gmqcc
 /div0-gittools
 /netradiant
 /mediasource
@@ -7,3 +9,10 @@
 /*.d0si
 *.yes
 *.no
+/data.old/
+/xonstat/
+/xonstatdb/
+/wiki
+
+.idea/
+/result*