From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Jan 2015 23:47:58 +0000 (+0000)
Subject: Merge branch 'sev/more_crosshairs' into 'master'
X-Git-Tag: xonotic-v0.8.1~146
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=929918e8484be669ef5d46185ed947739a232685;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/more_crosshairs' into 'master'

A few additional crosshairs

This is more a merge suggestion than a request (sorry for the recent avalanche).

Some time ago I created a few crosshairs that I feel are missing in the default set:
simple traditional design, unobtrusive, high-contrast.

Now I've noticed that the new menu has an empty row in the crosshair settings.

Add one and one together and you get this branch.

![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/14dc267bef/crosshairs.png)

See merge request !94
---

929918e8484be669ef5d46185ed947739a232685