]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Mon, 2 Apr 2012 06:58:00 +0000 (02:58 -0400)
committerSamual <samual@xonotic.org>
Mon, 2 Apr 2012 06:58:00 +0000 (02:58 -0400)
commit05fb311552c975dd88c475fdba312c361c95bacf
tree6bf50f8dd08369c6584874883d3dfda3ea7e0163
parentbb1c51447c3620b193974956bc39f3f532d21ce9
parent14401d27dcc6eeb85c80331c242dcbb3e1d977d7
Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/mutators/base.qh
12 files changed:
defaultXonotic.cfg
qcsrc/common/items.qh
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src