]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/server/campaign.qc

Simple merge