]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/pathfinding-optimizations
authormand1nga <mand1nga@xonotic.org>
Sat, 13 Aug 2011 03:51:05 +0000 (00:51 -0300)
committermand1nga <mand1nga@xonotic.org>
Sat, 13 Aug 2011 03:51:05 +0000 (00:51 -0300)
commitfa5cce8eeaabf0319467af3a99dc27d46c4c746d
tree8e35a207cf4d1d6ceae28d85a6b3c2ee1745da2c
parent37a1ac728faf4509acb9d5da80bc43b82556451f
parent55ac7522bd722c28ad63777168e35532c15bed55
Merge branch 'master' into mand1nga/pathfinding-optimizations

Conflicts:
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/navigation.qc