Merge master
authormand1nga <mand1nga@xonotic.org>
Sun, 4 Dec 2011 16:12:31 +0000 (13:12 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 4 Dec 2011 16:12:31 +0000 (13:12 -0300)
commitd6868c29436f076daf3e6c68e893d947ace437ff
tree35b389e55767a773ac24745cb3b043734abf0bea
parentf8397739e29b3da126ffe46c3c77def4b4babde1
parent96d653c418485a1d27107dba9407b57a3d02e9fc
Merge master
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/bot/bot.qc
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/waypoints.qc