]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Tue, 18 Oct 2011 20:45:48 +0000 (16:45 -0400)
committerSamual <samual@xonotic.org>
Tue, 18 Oct 2011 20:45:48 +0000 (16:45 -0400)
commit0885e3da8d333a38db3e6e3dc316568208e1bdc8
tree60e72d32b089d993cc52fd59b675790d674ab6b3
parent977847935270bdfdf208d3e96f876b74c066e559
parente97635c30f323b6915038e9efb8e5e97873bad64
Merge remote branch 'origin/master' into samual/hud_updates