projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59d44ed e4631a5)
Merge remote branch 'origin/mirceakitsune/new_loading_screens'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:12:03 +0000 (10:12 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:12:03 +0000 (10:12 +0200)

Trivial merge