]> 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: db3ca57 0344ce6)
Merge remote-tracking branch 'origin/DefaultUser/damagetext_friendlyfire'
authorMario <mario@smbclan.net>
Sun, 3 Jul 2016 23:12:12 +0000 (09:12 +1000)
committerMario <mario@smbclan.net>
Sun, 3 Jul 2016 23:12:52 +0000 (09:12 +1000)

Trivial merge