]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Mon, 2 Feb 2015 06:56:12 +0000 (17:56 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 2 Feb 2015 06:56:12 +0000 (17:56 +1100)
commitee915aa93047eb62efb1c20f76c5e69f54aecab2
treefd223a52f2c9edf116a0e3a4000cbf2221fcf75a
parent260b928f071f4f0bd08d232be32b65e7fe396438
parent02013c593abe7ccb7c6502148df33b34390d8216
Merge branch 'master' into Mario/combined_updates
qcsrc/common/playerstats.qc
qcsrc/server/cl_client.qc