Merge branch 'master' into TimePath/vehicles_cleanup
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 07:13:46 +0000 (17:13 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 23 Aug 2015 07:13:46 +0000 (17:13 +1000)
commit4c7352309564fc88b28216e0aa9ac509ce4d3dc6
tree84b22604038cbd118f5b8f5311021e1d79a61b1f
parent2ae8ccf2a62ca386ecf5c5627a4bc8fe8b4f2708
parent9b9817113127902ebe668e9ba6f7f45f8460c44b
Merge branch 'master' into TimePath/vehicles_cleanup

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/server/progs.src
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/server/g_damage.qc
qcsrc/server/progs.src