]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f88776a 35e6231)
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 03:52:45 +0000 (06:52 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 03:52:45 +0000 (06:52 +0300)
1  2 
qcsrc/server/player.qc patch | diff1 | diff2 | blob | history
qcsrc/server/player.qh patch | diff1 | diff2 | blob | history

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