]> 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: f7e9436 e65a02d)
Merged master into Lyberta/GivePlayerAmmo.
authorLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 18:24:14 +0000 (21:24 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 26 Aug 2017 18:24:14 +0000 (21:24 +0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

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