]> 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: 7a450de df33af4)
Merge branch 'master' into Mario/weaponarena_available
authorMario <mario@smbclan.net>
Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)
committerMario <mario@smbclan.net>
Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc xonotic-server.cfg
Simple merge