]> 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 | compact (merge: ce3adab 739f57f)
Merge branch 'master' into morphed/energyweapons
authorMario <mario@smbclan.net>
Wed, 22 Aug 2018 08:05:21 +0000 (18:05 +1000)
committerMario <mario@smbclan.net>
Wed, 22 Aug 2018 08:05:21 +0000 (18:05 +1000)

Trivial merge