]> 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: e3f69d9 d77d35f)
Merge branch 'z411/pickup_panel' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 4 Jan 2023 20:40:42 +0000 (20:40 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 4 Jan 2023 20:40:42 +0000 (20:40 +0000)
Item Pickup panel

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


Trivial merge