]> 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: 565b641 13b9257)
Merge branch 'Mario/format_message' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 11:05:11 +0000 (11:05 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 11:05:11 +0000 (11:05 +0000)
Merge branch Mario/format_message (S merge request)

More fun for chat replacement hacks

See merge request !196


Trivial merge