]> 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: 5d7aebf 5ad815a)
Merge branch 'terencehill/csqcmodel_settings'
authorterencehill <piuntn@gmail.com>
Mon, 15 Mar 2021 18:22:54 +0000 (19:22 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 15 Mar 2021 18:22:54 +0000 (19:22 +0100)

Trivial merge