]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/bot_maxplayers' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 29 Sep 2018 17:39:04 +0000 (17:39 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 29 Sep 2018 17:39:04 +0000 (17:39 +0000)
commit95da641845d520e3f59e5d47f418859a60704de7
treebe7fabe5ef272f5cd2bf6eb01d247c05ad6096b7
parentbeea46563579c7ea88b0d83bff711320e7467153
parentb612c917309718c140085875597ef27f66785042
Merge branch 'Mario/bot_maxplayers' into 'master'

Merge branch Mario/bot_maxplayers (XXS merge request)

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