]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into fruitiex/better_shownames
authorFruitieX <fruitiex@gmail.com>
Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
committerFruitieX <fruitiex@gmail.com>
Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
commit608a756561db3c149cd6e198218df0c37c6b736e
tree853a9faf92dfaef53d149624fe720bf40f97614a
parentf0eb018660a3673b9013272577927a77fd8fbdb4
parentb788b5d675fa3b301abb7762042dd326e8f6ad47
Merge remote-tracking branch 'origin/master' into fruitiex/better_shownames
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos_xhair_minimal.cfg
qcsrc/client/hud.qc
qcsrc/server/cl_player.qc