Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:33:10 +0000 (11:33 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:33:10 +0000 (11:33 -0400)
1  2 
defaultXonotic.cfg

Simple merge