]> 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: 5ad6b9f 308f4cb)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 22 Apr 2011 09:43:51 +0000 (11:43 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 22 Apr 2011 09:43:51 +0000 (11:43 +0200)

Trivial merge