]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/player_alpha
authorMario <mario@smbclan.net>
Sun, 30 Sep 2018 14:54:13 +0000 (00:54 +1000)
committerMario <mario@smbclan.net>
Sun, 30 Sep 2018 14:54:13 +0000 (00:54 +1000)
commit4e0bc6328c1332e0fb8326e75611ffb053ab8a4b
tree16dd2bad9d26d5b92b150cf76b70c82552821576
parente0b44197ce870e6262e0eeb41763e1bba8da3c5f
parent34f3c1d754abe766f800408a3e7bb0172ddda21f
Merge branch 'master' into Mario/player_alpha

# Conflicts:
# qcsrc/server/mutators/events.qh
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh