]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into mirceakitsune/playermodel_draconi
authorMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 15:35:17 +0000 (02:35 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 15:35:17 +0000 (02:35 +1100)
commita6f0b8a91bf021be3117623d1da297e699018dfb
tree763ccbe9b8fedb4ef8a2987ccfb4871ba46d6b05
parent55c77ee0e98f2783844439ea945f2b27d599091a
parent8139f0cf5bbea6c3f73c3205788ef941f14d6a9b
Merge remote-tracking branch 'origin/master' into mirceakitsune/playermodel_draconi