From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 1 May 2011 23:23:43 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/mirceakitsune/screen_update'
X-Git-Tag: xonotic-v0.5.0~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e78daa7d2cfde2fd3103511634a53bd5bc8b1777;p=xonotic%2Fmediasource.git

Merge remote-tracking branch 'origin/mirceakitsune/screen_update'
---

e78daa7d2cfde2fd3103511634a53bd5bc8b1777