Merge remote branch 'origin/master' into samual/waypointsprite_edgeoffset
authorSamual <samual@xonotic.org>
Tue, 12 Jul 2011 01:17:05 +0000 (21:17 -0400)
committerSamual <samual@xonotic.org>
Tue, 12 Jul 2011 01:17:05 +0000 (21:17 -0400)
commit5b902bfabe6575373dac2ffe636074c0308c6abf
treeeb46dc29512b90ccc472595e7dd718c87e0056f3
parentb7563bc4d55722ddd515154a7b63f2e27a2873f3
parentead998eb93f3b5df0d46e09455e7aa8fef44540d
Merge remote branch 'origin/master' into samual/waypointsprite_edgeoffset
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/waypointsprites.qc