git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

Final conflict merge

15 files changed:

qcsrc/client/hud/panel/centerprint.qc		diff \| blob \| history
qcsrc/client/hud/panel/scoreboard.qc		diff \| blob \| history
qcsrc/client/shownames.qc		diff \| blob \| history
qcsrc/common/command/generic.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc		diff \| blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc		diff \| blob \| history
qcsrc/common/items/inventory.qh		diff \| blob \| history
qcsrc/common/notifications/all.qh		diff \| blob \| history
qcsrc/common/state.qc		diff \| blob \| history
qcsrc/common/turrets/all.qh		diff \| blob \| history
qcsrc/common/weapons/all.qh		diff \| blob \| history
qcsrc/common/weapons/weapon/vortex.qc		diff \| blob \| history
qcsrc/menu/xonotic/credits.qc		diff \| blob \| history
qcsrc/server/command/sv_cmd.qc		diff \| blob \| history
qcsrc/server/command/vote.qc		diff \| blob \| history