]> 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 | combined (merge: c7e20e5 665eb5b)
Merge remote branch 'origin/tzork/uzifix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 15:09:28 +0000 (16:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 15:09:28 +0000 (16:09 +0100)

Trivial merge