From: Mario <mario@smbclan.net>
Date: Sat, 1 Oct 2016 11:12:10 +0000 (+1000)
Subject: Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
X-Git-Tag: xonotic-v0.8.2~326^2~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a71acaee20a61f78365ad6a05572f3b5e6812fb4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

# Conflicts:
#	qcsrc/server/impulse.qc
---

a71acaee20a61f78365ad6a05572f3b5e6812fb4