Merge branch 'master' into martin-t/example-config

[xonotic/xonotic.git] / .gitignore

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