]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Additional conflict merging
authorz411 <z411@omaera.org>
Thu, 1 Jun 2023 03:32:51 +0000 (23:32 -0400)
committerz411 <z411@omaera.org>
Thu, 1 Jun 2023 03:32:51 +0000 (23:32 -0400)
commit3c745da16229e6f9cf07dffa62ba7761f43e0dc8
tree24d35234f471906103f3fb4a6435c93e6acc4bee
parentdae2c5bf0bc7bcbd2d980dd7ba048a09b237c008
Additional conflict merging
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/common/items/inventory.qh
qcsrc/common/net_linked.qh
qcsrc/server/.world.qh.kate-swp [deleted file]
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/vote.qc
qcsrc/server/items/items.qc
qcsrc/server/world.qh