]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/_mod.qh
Merge remote-tracking branch 'origin/master'
authorMario <mario@smbclan.net>
Tue, 19 Jun 2018 01:34:38 +0000 (11:34 +1000)
committerMario <mario@smbclan.net>
Tue, 19 Jun 2018 01:34:38 +0000 (11:34 +1000)
commit879dac5094b8eb7890fb5fd970f822da31ee242f
treeaf9c778aef4bf4c587cc203cad2f40b58918e620
parent50d6cb6a02a959a7303b5b687631b664a807b26f
parent0a4df55ee43e504f4d6b84d0d7e9fd7d663a3206
Merge remote-tracking branch 'origin/master'