From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 16 Nov 2015 10:34:04 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/csqc_sounds
X-Git-Tag: xonotic-v0.8.2~1653^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0feb46a5f3f7db30054e67266e1c59f712f3da7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/csqc_sounds

# Conflicts:
#	qcsrc/client/main.qc
#	qcsrc/server/cl_player.qh
---

a0feb46a5f3f7db30054e67266e1c59f712f3da7