From: Mario <zacjardine@y7mail.com>
Date: Wed, 5 Aug 2015 12:34:44 +0000 (+0000)
Subject: Merge branch 'Mario/triggers' into 'master'
X-Git-Tag: xonotic-v0.8.1~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b6b2f6f6a9fa502c524c474db6510bc998ba861a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/triggers' into 'master'

Merge branch Mario/triggers (L merge request)

Adds various useful flags to existing triggers and brushes, and a new side-scroller trigger for extra fun.

See merge request !161
---

b6b2f6f6a9fa502c524c474db6510bc998ba861a