]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8beec64 883c711)
Merge branch 'terencehill/less_entities'
authorterencehill <piuntn@gmail.com>
Sun, 14 Mar 2021 21:21:48 +0000 (22:21 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 14 Mar 2021 21:21:48 +0000 (22:21 +0100)

Trivial merge