]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit33e2709cb7e724bcddd442aad479d15a39c16156
tree8f3a69f0c2575fe105dd5cb62853a90099b23d76
parentf779b7aba80874a4f513485375429e5543188c74
parent3eb37f18f83c9f32e1870442feaa6b9d9bbe4b3e
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
_hud_common.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/server/defs.qh
qcsrc/server/w_minelayer.qc