Merge branch 'devnexen/bsd' into 'master'

[xonotic/xonotic.git] / .gitignore

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