]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/playermodel_terminus mirceakitsune/playermodel_terminus
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:34:27 +0000 (04:34 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:34:27 +0000 (04:34 +1000)
commit591f78d376c2c2b53fb434ab4d47904608de083e
tree7fe110fbe6e2facbb76480c7b21557374c90cb83
parent61a878e2040a4adedd5bc96ab3542d459bc2e216
parent49260b6ae3d0ffae7f73abe2da1d8a35859b162d
Merge branch 'master' into mirceakitsune/playermodel_terminus