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

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

Merge branch 'master' into Mario/q3compat_sanity

12 files changed:

qcsrc/client/mapvoting.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/duel/duel.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/maplist.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/campaign.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	diff1 \|	diff2 \|	blob \| history
xonotic-common.cfg	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	diff1 \|	diff2 \|	blob \| history