Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Thu, 24 Oct 2013 18:38:46 +0000 (14:38 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 24 Oct 2013 18:38:46 +0000 (14:38 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/common/util.qh
qcsrc/menu/progs.src
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

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