]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f0ab1d 3366966)
Merge branch 'Mario/weapons_stat'
authorMario <mario@smbclan.net>
Tue, 5 Jun 2018 07:26:08 +0000 (17:26 +1000)
committerMario <mario@smbclan.net>
Tue, 5 Jun 2018 07:26:35 +0000 (17:26 +1000)

Trivial merge