Merge branch 'fret-diagram-details'master
commit69dfce4d1fdd11b0d6dcba06e5c9e1a71ea6f284
authorCarl Sorensen <c_sorensen@byu.edu>
Thu, 26 Jun 2008 01:05:32 +0000 (25 19:05 -0600)
committerCarl Sorensen <c_sorensen@byu.edu>
Thu, 26 Jun 2008 01:05:32 +0000 (25 19:05 -0600)
tree2a1b917270d9c02b7bfdeabf90c494145cd85326
parent879202851f7b3d03c67445af0725fcfbd0709940
parent6c5528088546c1556ed9e641e1a9976297e81f0f
Merge branch 'fret-diagram-details'