Merge remote-tracking branch 'origin/master into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Sun, 9 Mar 2014 01:07:41 +0000 (20:07 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 9 Mar 2014 01:07:41 +0000 (20:07 -0500)
commit198c14c07ac0c2f4484c171fce4145dcedc42172
tree2675828697ec3110a3af64654c181cde1a1adbbd
parent80834cbced1facdc20bb37cb73f6ab95f76d16d1
parent9aa300c859f50fb6f06e5caef46cc7af1e3bc51b
Merge remote-tracking branch 'origin/master into samual/weapons

Conflicts:
qcsrc/common/util.qh
qcsrc/common/util.qc
qcsrc/common/util.qh