]> 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: 8ae6561 05d81c7)
Merge remote branch 'origin/divVerent/bastet'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 28 Apr 2010 14:34:02 +0000 (16:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 28 Apr 2010 14:34:02 +0000 (16:34 +0200)

Trivial merge