]> 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: a0c50c9 98c2eca)
Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Wed, 18 Apr 2012 14:11:10 +0000 (16:11 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 18 Apr 2012 14:11:10 +0000 (16:11 +0200)

Trivial merge