]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/intrusive 344/head
authorMario <mario@smbclan.net>
Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
committerMario <mario@smbclan.net>
Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)
commit36a3cd7d36531bca786228cf9c23368f7d7cb1c5
tree9f397fa491bed05a4fcf90c563f3226cb539d3f9
parent70d72043fb43db528eeef40133f6d4dffa427230
parent77c46a6022a0e5c6fa2541e858a0cd9cba8d6b0b
Merge branch 'master' into Mario/intrusive
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/mutators/mutator/gamemode_assault.qc