]> 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: 63841dd 7718f96)
Merge branch 'master' into martin-t/dmgtext2
authorterencehill <piuntn@gmail.com>
Fri, 16 Jun 2017 21:22:31 +0000 (23:22 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Jun 2017 21:22:31 +0000 (23:22 +0200)

Trivial merge