]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 441305c 204d6d0)
Merge remote branch 'origin/cbrutail/nexballcreditfix'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 2 Dec 2010 12:41:27 +0000 (13:41 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 2 Dec 2010 12:41:27 +0000 (13:41 +0100)

Trivial merge