]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 26 Nov 2011 19:38:30 +0000 (14:38 -0500)
committerSamual <samual@xonotic.org>
Sat, 26 Nov 2011 19:38:30 +0000 (14:38 -0500)
commitfb3dd670570afd2a2896108f02f4c85dd6b4b55c
treef38bf49fcc0654476365d487032820d7a24f062b
parenta68d411f9a130f89964189bae97d43017420d437
parent524b025b3abceadfcdb9b124e47fdcc087341a60
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
qcsrc/client/Main.qc
qcsrc/server/clientcommands.qc
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/gamecommand.qc
qcsrc/client/main.qh
qcsrc/client/progs.src
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src