]> 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: 5ec3706 d1a9779)
Merge branch 'master' into morphed/hagar 284/head
authorMario <mario@smbclan.net>
Sat, 20 Feb 2016 12:04:06 +0000 (22:04 +1000)
committerMario <mario@smbclan.net>
Sat, 20 Feb 2016 12:04:06 +0000 (22:04 +1000)

Trivial merge