Merge remote-tracking branch 'origin/master' into Mario/monsters
authorSamual Lenks <samual@xonotic.org>
Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)
15 files changed:
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/util.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/accuracy.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/w_shotgun.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge