]> 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: 4233bc1 8b7fb2f)
Merge branch 'master' into terencehill/misc_hud_fixes
authorterencehill <piuntn@gmail.com>
Sat, 9 Jul 2016 17:28:29 +0000 (19:28 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 9 Jul 2016 17:28:29 +0000 (19:28 +0200)

Trivial merge