]> 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: ac92712 23b2d90)
Merge remote branch 'origin/fruitiex/sev-skin'
authorRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:52:09 +0000 (14:52 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:52:09 +0000 (14:52 +0200)

Trivial merge