]> 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: 0edf109 e3746a1)
Merge branch 'master' into divVerent/bastet
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 14:29:05 +0000 (16:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 14:29:05 +0000 (16:29 +0200)

Trivial merge