From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 14 Apr 2016 06:06:02 +0000 (+1000)
Subject: Merge remote-tracking branch 'illwieckz/unvanquished'
X-Git-Tag: xonotic-v0.8.2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba09e304aaad5882eccb07464b85b2d3f08bc406;p=xonotic%2Fnetradiant.git

Merge remote-tracking branch 'illwieckz/unvanquished'
---

ba09e304aaad5882eccb07464b85b2d3f08bc406
diff --cc tools/quake3/CMakeLists.txt
index e6831203,e6831203..ad87f570
--- a/tools/quake3/CMakeLists.txt
+++ b/tools/quake3/CMakeLists.txt
@@@ -44,6 -44,6 +44,7 @@@ set(q3map2_game
          q3map2/game_sof2.h
          q3map2/game_tenebrae.h
          q3map2/game_tremulous.h
++        q3map2/game_unvanquished.h
          q3map2/game_wolf.h
          q3map2/game_wolfet.h
          q3map2/game_xonotic.h