]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 15 Oct 2011 18:03:04 +0000 (14:03 -0400)
committerSamual <samual@xonotic.org>
Sat, 15 Oct 2011 18:03:04 +0000 (14:03 -0400)
commit4f9149218900484f5d0ee0ab4d6d6b31f96f2be7
tree059353421154cc16f21f0ca03e92fda8c711ff87
parentca287b246d99318b20280ee6313ab305b23d8ba2
parent7c8995e3ccc4a2504891c7c52359e7817ebc25ea
Merge remote branch 'origin/master' into samual/hud_updates
qcsrc/server/w_shotgun.qc