]> 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: ec194cb 65ad627)
Merge branch 'terencehill/crosshair_chase_fix'
authorterencehill <piuntn@gmail.com>
Sun, 21 Mar 2021 19:46:56 +0000 (20:46 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 21 Mar 2021 19:46:56 +0000 (20:46 +0100)

Trivial merge