Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
authorSamual Lenks <samual@xonotic.org>
Wed, 22 May 2013 02:34:46 +0000 (22:34 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 22 May 2013 02:34:46 +0000 (22:34 -0400)
commite14bb786305e05541496fb5b28c090e0ff1b5783
tree1bfe48b326052b9949958cf5bf5d096b041e069c
parentf30c5ae377d737080f15ee92db3a1ce7c591e803
parentf1ca9e449c3366f505d5d2898cddb8f504974138
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

Conflicts:
tooltips.db
tooltips.db