]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/killother 327/head
authorMario <mario@smbclan.net>
Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
committerMario <mario@smbclan.net>
Thu, 23 Jun 2016 20:24:59 +0000 (06:24 +1000)
commitf2a7c3c0c62985e64a71b475c55bc974d28e0805
tree180e76088dffc3f05aa5b1fc232aac9fbc149475
parent17b2adabf26ae062a323bb0d2016bf2eea6aea14
parentd998b4fe8d146d6280bab078306707fb0d29aa9e
Merge branch 'master' into Mario/killother
qcsrc/common/mutators/mutator/buffs/buffs.qc
qcsrc/common/mutators/mutator/sandbox/sandbox.qc
qcsrc/common/vehicles/sv_vehicles.qc