Merge branch 'master' into Penguinum/Antiwall
authorMario <zacjardine@y7mail.com>
Sun, 12 Jul 2015 10:46:34 +0000 (20:46 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 12 Jul 2015 10:46:34 +0000 (20:46 +1000)
commit6e12e42c14caa13f188ad12ce1fce1358428bee4
tree1da502b6f27b76e0f682c7d55c261ec1665b6050
parent3a1633035f0cb6a41a8ee0018c2996a4416f62a1
parent137b6d422a479562045916cfcbf26025fd48f3e7
Merge branch 'master' into Penguinum/Antiwall
qcsrc/client/wall.qc
qcsrc/client/wall.qh
qcsrc/server/defs.qh
qcsrc/server/g_models.qc
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh