]> 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: b465997 4181392)
Merge branch 'master' into martin-t/defaults
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 08:06:38 +0000 (18:06 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 08:06:38 +0000 (18:06 +1000)
1  2 
commands.cfg patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc commands.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge