# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1336044677 18000
# Node ID e1540c355131fdc14865138a963722397c6638a1
# Parent  629a94745cc9bede040c0cb84a5fdcc04979cb5a
merge drum tracks

diff -r 629a94745cc9 -r e1540c355131 music/Friendship is Magic (MLP Theme Song).rg
Binary file music/Friendship is Magic (MLP Theme Song).rg has changed