projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08de675 1be1693)
Merge branch 'Mario/frozen_floating' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 23 May 2020 20:40:41 +0000 (20:40 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 23 May 2020 20:40:41 +0000 (20:40 +0000)
Merge branch Mario/frozen_floating (M merge  request)

See merge request xonotic/xonotic-data.pk3dir!815


Trivial merge