]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d0c2bf 27d12c6)
Merge branch 'martin-t/server.cfg' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 6 Jan 2017 00:29:36 +0000 (00:29 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 6 Jan 2017 00:29:36 +0000 (00:29 +0000)
Mention apropos and cacs in server.cfg

See merge request !20

1  2 
server/server.cfg patch | diff1 | diff2 | blob | history

diff --cc server/server.cfg
Simple merge