]> 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: 2e575b9 c89ff96)
Merge branch 'martin-t/help' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 05:53:03 +0000 (05:53 +0000)
Help system

See merge request xonotic/xonotic-data.pk3dir!603

1  2 
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc xonotic-server.cfg
Simple merge