]> 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: b76feab 382bd46)
Merge remote branch 'origin/fruitiex/rzde_loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:37:52 +0000 (14:37 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:37:52 +0000 (14:37 +0100)

Trivial merge