]> de.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: 786858d 379ed69)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 10 Feb 2011 12:42:21 +0000 (13:42 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 10 Feb 2011 12:42:21 +0000 (13:42 +0100)

Trivial merge