]> 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: d08d78a 7c19cc7)
Merge branch 'master' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 8 Sep 2017 20:23:27 +0000 (22:23 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 8 Sep 2017 20:23:27 +0000 (22:23 +0200)
1  2 
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge