]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/campaign_message_tweak
authorterencehill <piuntn@gmail.com>
Mon, 13 Jan 2020 11:23:21 +0000 (12:23 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 13 Jan 2020 11:23:21 +0000 (12:23 +0100)
commit165da6e93125c22b429b0816896560c8ea23549b
tree88ccf8f3198048d3cc8e7a7f17ecc0136a599d27
parent62a9cbfc0aa5392d5be072fe1ded20e7b79e5156
parentc4e88ea7edc06a6cd082d8d05547465418291c46
Merge branch 'master' into terencehill/campaign_message_tweak
qcsrc/server/campaign.qc