]> 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: 4d6af1f 8a01911)
Merge remote branch 'refs/remotes/origin/esteel/anim/slider'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 23 May 2010 14:46:47 +0000 (16:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 23 May 2010 14:46:47 +0000 (16:46 +0200)

Trivial merge