]> 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: cd3818a eea95fe)
Merge remote-tracking branch 'origin/nyov/hookfix'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 16 Nov 2011 08:55:17 +0000 (09:55 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 16 Nov 2011 08:55:17 +0000 (09:55 +0100)

Trivial merge