]> 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: 6f8580d d299cf8)
Merge remote-tracking branch 'origin/DefaultUser/overkill_filteritem_fix'
authorMario <mario@smbclan.net>
Wed, 12 Oct 2016 21:53:51 +0000 (07:53 +1000)
committerMario <mario@smbclan.net>
Wed, 12 Oct 2016 21:53:51 +0000 (07:53 +1000)

Trivial merge