]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/playermodel_ubot mirceakitsune/playermodel_ubot
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:33:35 +0000 (04:33 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:33:35 +0000 (04:33 +1000)
commit537c7579e9b7212ddbdf2ac32476227d841ffca9
tree70be60f660895605af48685b00efc710844e87c7
parentab75e2748bb72b9f9a1c559e6e40313d893e1b9f
parent49260b6ae3d0ffae7f73abe2da1d8a35859b162d
Merge branch 'master' into mirceakitsune/playermodel_ubot