]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0355afe 07247bc)
Merge remote branch 'origin/fruitiex/rzde_loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:52:57 +0000 (14:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:52:57 +0000 (14:52 +0100)

Trivial merge