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

[xonotic/xonotic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f590f872be1ea544533d003f599f72d09dd035d0..ab43afbbdc6d7046ab40283c8bf70dd584cfea1e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /build/
+/daemon
 /darkplaces
-/fteqcc
 /gmqcc
 /div0-gittools
 /netradiant
@@ -13,3 +13,6 @@
 /xonstat/
 /xonstatdb/
 /wiki
+
+.idea/
+/result*