]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: cc52f1e 7ad3616)
Merge remote branch 'refs/remotes/origin/fruitiex/blurfont'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:25:02 +0000 (09:25 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:25:02 +0000 (09:25 +0200)

Trivial merge