]> 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: a89ae14 cd7ed86)
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 18:54:47 +0000 (21:54 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 18:54:47 +0000 (21:54 +0300)
1  2 
qcsrc/server/player.qc patch | diff1 | diff2 | blob | history

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