projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c235365 c9e8d92)
Merge remote branch 'origin/sev/font-xolonium'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 11 Jan 2011 14:15:04 +0000 (15:15 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 11 Jan 2011 14:15:04 +0000 (15:15 +0100)

Trivial merge