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)
commite1aebfe75eb37266c13964374bc9e662feb0e716
tree3236c87e5e73f567a06b27d21de2942092944579
parent6a813f3218ebae601bd997d36f88c4c97dd1a7f0
parentf85ba46152a91059e9e5cce2856d10cf237cf2eb
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
defaultXonotic.cfg