Merge remote-tracking branch 'origin/master' into samual/notification_updates
authorSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)
1  2 
qcsrc/common/util.qh
qcsrc/server/command/common.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge