]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
Merge remote branch 'refs/remotes/origin/mirceakitsune/screen_textures'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 15:11:23 +0000 (16:11 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 15:11:23 +0000 (16:11 +0100)

Trivial merge