Merge branch 'martin-t/server.cfg' into 'master'

[xonotic/xonotic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 100ef0b1cfa057302dfc24baba3c663a33cfb250..0a76101ea4fb0d17e80502bddbcc4d7441ecc659 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
+/build/
+/daemon
 /darkplaces
-/fteqcc
 /gmqcc
 /div0-gittools
 /netradiant
@@ -12,3 +13,5 @@
 /xonstat/
 /xonstatdb/
 /wiki
+
+.idea/