Merge remote-tracking branch 'origin/samual/update_effects_tab'
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)
commitb12ef86ae1464d5bf43eb113a27e0e5b80fd21a5
tree54f4f6b9e49f04eb52b6a4369a020674b981a41a
parentf85ba46152a91059e9e5cce2856d10cf237cf2eb
parente48453ec508831b734eba441c2446c0f7f6c5124
Merge remote-tracking branch 'origin/samual/update_effects_tab'