]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f41bf8 aab81d1)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 16 Jun 2011 04:56:13 +0000 (06:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 16 Jun 2011 04:56:13 +0000 (06:56 +0200)

Trivial merge