]> 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: f55c7a1 a7829e9)
Merge commit 'a7829e92ab32fb6859749938a2cd1294fda41d50'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Aug 2011 14:04:46 +0000 (16:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Aug 2011 14:04:46 +0000 (16:04 +0200)

Trivial merge