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

Trivial merge