]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into divVerent/waypointeditor-auto
authormand1nga <mand1nga@xonotic.org>
Tue, 30 Aug 2011 02:47:09 +0000 (23:47 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 30 Aug 2011 02:47:09 +0000 (23:47 -0300)
1  2 
defaultXonotic.cfg
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/waypoints.qc
qcsrc/server/bot/waypoints.qh

Simple merge
Simple merge
Simple merge
Simple merge