]> 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: 3220cab 49260b6)
Merge branch 'master' into Mario/fullbright_skins 311/head
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 13:42:28 +0000 (23:42 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 13:42:28 +0000 (23:42 +1000)

Trivial merge