]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92749b5 b34c992)
Merge branch 'master' into terencehill/translate_colors_2
authorterencehill <piuntn@gmail.com>
Sun, 27 Mar 2016 17:43:20 +0000 (19:43 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 27 Mar 2016 17:43:20 +0000 (19:43 +0200)

Trivial merge