Merge remote-tracking branch 'origin/divVerent/waypointeditor-auto'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 9 Jan 2012 20:19:08 +0000 (21:19 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 9 Jan 2012 20:19:08 +0000 (21:19 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/bot/bot.qc

Simple merge
Simple merge
Simple merge