Merge branch 'master' into Mario/arc_sounds
authorMario <zacjardine@y7mail.com>
Fri, 19 Dec 2014 12:48:24 +0000 (23:48 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 19 Dec 2014 12:48:24 +0000 (23:48 +1100)
1  2 
effectinfo.txt

diff --cc effectinfo.txt
Simple merge