]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 18:44:42 +0000 (13:44 -0500)
1  2 
_hud_common.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/server/defs.qh
qcsrc/server/w_minelayer.qc

diff --cc _hud_common.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge