]> 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: 1cbe242 b123849)
Merge branch 'develop' into terencehill/player_models_improvements
authorterencehill <piuntn@gmail.com>
Fri, 22 Apr 2022 10:06:16 +0000 (12:06 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 22 Apr 2022 10:06:16 +0000 (12:06 +0200)

Trivial merge