]> 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: d7cca4c 23381a5)
Merge /tmp/bundle
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 27 Jan 2011 16:06:10 +0000 (17:06 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 27 Jan 2011 16:06:10 +0000 (17:06 +0100)

Trivial merge