Merge branch 'TimePath/modules'
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 21 Aug 2016 06:29:24 +0000 (16:29 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 21 Aug 2016 06:29:39 +0000 (16:29 +1000)
commit06ac66a5edaa645e19ed9a6482409e8656a65b1d
tree8badc3d4591d9f81e595f748ab4742e455c697bd
parent5134c592b8e912ce0f05ff8f8a2f3c258f8924d6
parent600bdf0bd08eb8a12285978d4ed97429018e7f09
Merge branch 'TimePath/modules'

# Conflicts:
# qcsrc/common/turrets/turret/fusionreactor.qc
qcsrc/common/mutators/mutator/waypoints/all.qh
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/turrets/turret/fusionreactor.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/events.qh