]> 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: 70ad864 0e7968c)
Merge remote branch 'origin/fruitiex/kay_crosshairs'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 15:40:19 +0000 (17:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 15:40:19 +0000 (17:40 +0200)

Trivial merge