]> 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: 817b644 8616417)
Merge remote branch 'origin/mirceakitsune/sniper_crosshair'
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 28 Aug 2011 15:33:45 +0000 (17:33 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 28 Aug 2011 15:33:45 +0000 (17:33 +0200)

Trivial merge