]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f600c87 ab81398)
Merge remote-tracking branch 'origin/Mario/mute_bot_warnings'
authorSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 23:44:49 +0000 (19:44 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 11 May 2013 23:44:49 +0000 (19:44 -0400)
1  2 
qcsrc/server/bot/navigation.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/bot/navigation.qc
Simple merge