Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 9 Mar 2014 01:12:14 +0000 (20:12 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 9 Mar 2014 01:12:14 +0000 (20:12 -0500)
commitbfd4316c7714f8982a0d0a771b7bd616241fbb8b
tree8959cf99fd55ebbd6c3f42008453484b02604f6a
parent225e74332de2e71b4d084b75e422686a8ffaf6ee
parent9aa300c859f50fb6f06e5caef46cc7af1e3bc51b
Merge remote-tracking branch 'origin/master' into samual/combined_updates
qcsrc/common/util.qc
qcsrc/common/util.qh