From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Jun 2011 08:28:50 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~199^2~13^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8fd199794a4136325f14dfff5b1d0d44da32f3cb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

Conflicts:
	qcsrc/server/bot/havocbot/havocbot.qc
	qcsrc/server/bot/havocbot/roles.qc
---

8fd199794a4136325f14dfff5b1d0d44da32f3cb
diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index 265731f69,5da945c90..7c2f98634
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@@ -2,7 -2,7 +2,8 @@@
  #include "role_ctf.qc"
  #include "role_onslaught.qc"
  #include "role_keyhunt.qc"
 +#include "role_freezetag.qc"
+ #include "role_keepaway.qc"
  #include "roles.qc"
  
  void havocbot_ai()