]> 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: b5433af 489d9cc)
Merge remote-tracking branch 'origin/TimePath/issues/1990' into terencehill/menu_game...
authorterencehill <piuntn@gmail.com>
Sat, 31 Mar 2018 00:07:16 +0000 (02:07 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 31 Mar 2018 00:07:16 +0000 (02:07 +0200)

Trivial merge