]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Mon, 9 Feb 2015 21:10:00 +0000 (08:10 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 9 Feb 2015 21:10:00 +0000 (08:10 +1100)
commita66ae546bae533f18068ba20712b823e8e0b59de
tree6d637bf17d0599e27e634fa4d11306c27cd445e7
parent7dc8ba745f5d16096fb070e739d4ab6989e3c8d1
parentf2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d
Merge branch 'master' into Mario/combined_updates
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/dpdefs/menudefs.qh
qcsrc/server/cl_client.qc