]> 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: bb0f5d7 4148dd7)
Merge branch 'typofix' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 2 Oct 2017 14:06:49 +0000 (14:06 +0000)
committerMirio <opivy@hotmail.de>
Mon, 2 Oct 2017 14:06:49 +0000 (14:06 +0000)
someone got too close _to_ someones rocket

See merge request xonotic/xonotic-data.pk3dir!500


Trivial merge