]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d6e4bb 1d61c51)
Merge branch 'martin-t/vbots' into 'master'
authorMario <mario.mario@y7mail.com>
Wed, 25 Sep 2019 23:51:52 +0000 (23:51 +0000)
committerMario <mario.mario@y7mail.com>
Wed, 25 Sep 2019 23:51:52 +0000 (23:51 +0000)
Add bots, nobots, document new bot skill

See merge request xonotic/xonotic!52

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

diff --cc server/server.cfg
Simple merge