Merge branch 'master' into terencehill/bot_waypoints 670/head
authorMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)
commit19794b31e782cca0f5a0d916bc5fd4dc6156eeaf
tree08751f30241a3760bd6278b4c4db0de7ffac3af5
parent8a60bbd1a4b7fcb5708d40244ac2a2df60e3313b
parent59fd396c7eb8a934f34ec985d3b78c73c4817ef7
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# .gitlab-ci.yml
qcsrc/server/command/cmd.qc
xonotic-client.cfg