Merge branch 'bones_was_here/gitignorewebsite' into 'master'

[xonotic/xonotic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ab43afbbdc6d7046ab40283c8bf70dd584cfea1e..4d858682ae70d59d4d988bcf40d56e579f1768de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /build/
-/daemon
+/daemon-glue
 /darkplaces
 /gmqcc
 /div0-gittools
@@ -12,6 +12,7 @@
 /data.old/
 /xonstat/
 /xonstatdb/
+/xonotic.org
 /wiki
 
 .idea/