From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 14 Apr 2016 12:39:17 +0000 (+1000)
Subject: Update gitignore
X-Git-Tag: xonotic-v0.8.2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77b31c853930291e9b20f0235acc41a6369fd8de;p=xonotic%2Fxonotic.git

Update gitignore
---

diff --git a/.gitignore b/.gitignore
index f590f872..0a76101e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /build/
+/daemon
 /darkplaces
-/fteqcc
 /gmqcc
 /div0-gittools
 /netradiant
@@ -13,3 +13,5 @@
 /xonstat/
 /xonstatdb/
 /wiki
+
+.idea/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 734d5934..55ee124f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ macro(subproject name)
     endif ()
 endmacro()
 
+subproject(daemon)
 subproject(darkplaces)
 subproject(data/xonotic-data.pk3dir)
 subproject(gmqcc)