]> de.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: beea465 b612c91)
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)
Merge branch Mario/bot_maxplayers (XXS merge request)

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


Trivial merge