]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94cf38e 1a507ac)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:28:50 +0000 (10:28 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:28:50 +0000 (10:28 +0200)
Conflicts:
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc

1  2 
qcsrc/server/bot/havocbot/havocbot.qc patch | diff1 | diff2 | blob | history
qcsrc/server/bot/havocbot/roles.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index 265731f690d1d4ea231d976491301eb842f623ab,5da945c90124d8d7262bdbd5830653860ad336d2..7c2f986346677e73b2cefc533cf45651ebd18cf0
--- 1/qcsrc/server/bot/havocbot/havocbot.qc
--- 2/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()
diff --cc qcsrc/server/bot/havocbot/roles.qc
Simple merge