]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/server/player.qc

Simple merge