]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f22b01 5f8c3e0)
Merge remote branch 'origin/fruitiex/loadblackbg'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 13 Oct 2010 16:49:17 +0000 (18:49 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 13 Oct 2010 16:49:17 +0000 (18:49 +0200)

Trivial merge