]> de.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: 1a11758 ffacefe)
Merge branch 'bones_was_here/itemsdesync' into 'master'
authorterencehill <piuntn@gmail.com>
Thu, 15 Jun 2023 21:56:43 +0000 (21:56 +0000)
committerterencehill <piuntn@gmail.com>
Thu, 15 Jun 2023 21:56:43 +0000 (21:56 +0000)
Items overhaul

Closes #2824, #2059, and #1046

See merge request xonotic/xonotic-data.pk3dir!1202


Trivial merge