]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27ac1e5 5925c96)
Merge branch 'master' into Mario/tweaks 357/head
authorMario <mario@smbclan.net>
Sat, 20 Aug 2016 12:43:48 +0000 (22:43 +1000)
committerMario <mario@smbclan.net>
Sat, 20 Aug 2016 12:43:48 +0000 (22:43 +1000)

Trivial merge