From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 2 Nov 2010 15:11:23 +0000 (+0100)
Subject: Merge remote branch 'refs/remotes/origin/mirceakitsune/screen_textures'
X-Git-Tag: xonotic-v0.1.0preview~8
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=a1c7b87857a02d319589079ef338701e7e426021;hp=ea7fdae9ad67014f1588d35ca796a2e167b2a79b

Merge remote branch 'refs/remotes/origin/mirceakitsune/screen_textures'
---