From: Samual <samual@xonotic.org>
Date: Tue, 27 Sep 2011 03:32:00 +0000 (-0400)
Subject: Merge remote branch 'origin/terencehill/menu_tooltips_2'
X-Git-Tag: xonotic-v0.6.0~40^2~108
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=810822f6f2e4acee45e872700b9f2cabd38fa6fa;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/menu_tooltips_2'
---

810822f6f2e4acee45e872700b9f2cabd38fa6fa