]> 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: 52ce871 5f61346)
Merge commit 'origin/esteel/anim/framework'
authorRudolf Polzer <rpolzer@grawp.(none)>
Sun, 11 Apr 2010 18:13:07 +0000 (20:13 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Sun, 11 Apr 2010 18:13:07 +0000 (20:13 +0200)

Trivial merge