Merge branch 'marin-t/contributing' into 'master'

[xonotic/xonotic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 71bda24bc4b04a5a959a31125ec532f4330bd234..ab43afbbdc6d7046ab40283c8bf70dd584cfea1e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
+/build/
+/daemon
 /darkplaces
-/fteqcc
 /gmqcc
 /div0-gittools
 /netradiant
@@ -11,3 +12,7 @@
 /data.old/
 /xonstat/
 /xonstatdb/
+/wiki
+
+.idea/
+/result*