]> 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: 8c6273b 41f3bac)
Merge branch 'master' into Mario/intrusive 441/head
authorMario <mario@smbclan.net>
Wed, 17 May 2017 23:49:28 +0000 (09:49 +1000)
committerMario <mario@smbclan.net>
Wed, 17 May 2017 23:49:28 +0000 (09:49 +1000)

Trivial merge