]> 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: 8490829 bb057d4)
Merge branch 'Mario/flag_return_fixes'
authorMario <mario@smbclan.net>
Tue, 19 Jul 2016 14:23:41 +0000 (00:23 +1000)
committerMario <mario@smbclan.net>
Tue, 19 Jul 2016 14:23:41 +0000 (00:23 +1000)

Trivial merge