]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c16f84c c85cc81)
Merge branch 'master' into Lyberta/PrintMove
authorLyberta <lyberta@lyberta.net>
Thu, 17 May 2018 08:42:02 +0000 (11:42 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 17 May 2018 08:42:02 +0000 (11:42 +0300)
1  2 
qcsrc/server/player.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/player.qc
Simple merge