]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Tue, 27 Dec 2011 20:25:20 +0000 (15:25 -0500)
committerSamual <samual@xonotic.org>
Tue, 27 Dec 2011 20:25:20 +0000 (15:25 -0500)
commitefab64ab443b4182a8dda35f0fb517eb78897ea0
tree4aacb5b0b00f57ef3c0be7d8ad1e5b133a8c360d
parent29b55dfa978a11a987d1f4ea1ec586272115ddab
parent03d652ec7950e3fe07df538c9f572e4089d68de5
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/main.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
commands.cfg
qcsrc/client/Main.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/common/command/generic.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/command/menu_cmd.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src