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

Simple merge
Simple merge
Simple merge