]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa8a782 8d2492a)
Merge branch 'master' into bones_was_here/net_s6 bones_was_here/net_s6
authorCloudwalk <cloudwalk009@gmail.com>
Sat, 29 May 2021 18:16:13 +0000 (14:16 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Sat, 29 May 2021 18:16:13 +0000 (14:16 -0400)

Trivial merge