]> 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: 9df080e f05eb89)
Merge branch 'master' into Mario/weapons_fpsfix
authorMario <mario@smbclan.net>
Mon, 3 Jul 2017 13:39:50 +0000 (23:39 +1000)
committerMario <mario@smbclan.net>
Mon, 3 Jul 2017 13:39:50 +0000 (23:39 +1000)

Trivial merge