Merge branch 'master' into TimePath/effectinfo
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 06:11:23 +0000 (16:11 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 06:11:23 +0000 (16:11 +1000)
1  2 
qcsrc/client/progs.inc
qcsrc/server/progs.inc

Simple merge
Simple merge