]> 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: 7c45ce8 8b2a456)
Merge branch 'mand1nga/bot-fix-aiming-origins' into mand1nga/bot-assault
authormand1nga <mand1nga@xonotic.org>
Tue, 9 Aug 2011 02:23:54 +0000 (23:23 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 9 Aug 2011 02:23:54 +0000 (23:23 -0300)
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
Simple merge
diff --cc qcsrc/server/bot/havocbot/roles.qc
Simple merge