]> 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: 7641890 f1ead60)
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Feb 2018 12:49:04 +0000 (13:49 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Feb 2018 12:49:04 +0000 (13:49 +0100)
1  2 
defaultServer.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc defaultServer.cfg
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge