]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sat, 1 Jun 2013 20:01:59 +0000 (06:01 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 1 Jun 2013 20:01:59 +0000 (06:01 +1000)
commitc830adab7065491164abb531af83113109017301
tree748dcd1f6121577e929caadb0fa4c5986bfa0c42
parent264bfe3c675e13957c0188c75276af431f8a433f
parentef7fb74ce9ad83994863a75b8ffd338cad29d68d
Merge branch 'master' into Mario/monsters
qcsrc/server/cl_player.qc