]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/lib/warpzone/util_server.qc
Merge branch 'master' into Mario/hagar_notfixed 297/head
authorMario <mario@smbclan.net>
Tue, 5 Apr 2016 22:55:40 +0000 (08:55 +1000)
committerMario <mario@smbclan.net>
Tue, 5 Apr 2016 22:55:40 +0000 (08:55 +1000)
commit3cfb64730d883ae9ccf0315f365da19345270890
treeb44571dc96b2a3489e9b1fac3251267472b340a6
parent37cf62041a76248472ef6a78feaaed33e35a2260
parentb0423598270855d5f0a3206d46f0ebf43182b411
Merge branch 'master' into Mario/hagar_notfixed
qcsrc/client/view.qc
qcsrc/common/weapons/weapon/hagar.qc