]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/playermodel_draconi mirceakitsune/playermodel_draconi
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:35:16 +0000 (04:35 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:35:16 +0000 (04:35 +1000)
commit98e75132237b0ab664a980058b940508d5041435
treecc5d808475d40fc0c1eebc05cdab89c7abbccd12
parenta6f0b8a91bf021be3117623d1da297e699018dfb
parent49260b6ae3d0ffae7f73abe2da1d8a35859b162d
Merge branch 'master' into mirceakitsune/playermodel_draconi