]> 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: ee6e2d1 cdf8d22)
Merge remote branch 'origin/terencehill/crosshair_colors'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)

Trivial merge