]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/menu/command/all.qh
Merge branch 'master' into terencehill/quickmenu
Conflicts:
_hud_common.cfg
_hud_descriptions.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/hud_config.qh
qcsrc/client/main.qc
qcsrc/client/mapvoting.qh
qcsrc/client/scoreboard.qc
qcsrc/client/view.qc
qcsrc/menu/xonotic/mainwindow.qc
21 files changed:
projects / xonotic / xonotic-data.pk3dir.git / commit