]> 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: 8879e39 49260b6)
Merge branch 'master' into terencehill/hud_shake_fix
authorterencehill <piuntn@gmail.com>
Tue, 14 Jun 2016 18:15:35 +0000 (20:15 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 14 Jun 2016 18:15:35 +0000 (20:15 +0200)

Trivial merge