]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 28 Oct 2017 22:24:33 +0000 (00:24 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 28 Oct 2017 22:24:33 +0000 (00:24 +0200)
commit077b7a0d5f4a3912050ee365d12e6a9fae8f74aa
treed9ba6a20de5dd35a731f0245d11aad3879d32382
parent7125cd65c9eebc1c92dd4461608e84f7f1105998
parent61659a08c8e5f2cf5469978b2e0ebba42b349ebf
Merge branch 'master' into martin-t/uncrustify
qcsrc/server/player.qc