Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Sun, 5 Jan 2014 03:36:30 +0000 (22:36 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 5 Jan 2014 03:36:30 +0000 (22:36 -0500)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/common/notifications.qh

Simple merge
Simple merge
Simple merge
Simple merge