]> 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: b58d502 c0f78e0)
Merge branch 'master' into terencehill/hud_fixes
authorterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 15:18:28 +0000 (16:18 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 13 Mar 2016 15:18:28 +0000 (16:18 +0100)
Conflicts:
qcsrc/common/mutators/mutator/damagetext/damagetext.qc


Trivial merge