]> git.donarmstrong.com Git - lilypond.git/commit
Fix merge errors from previous patch
authorCarl Sorensen <c_sorensen@byu.edu>
Fri, 13 Aug 2010 23:23:39 +0000 (17:23 -0600)
committerCarl Sorensen <c_sorensen@byu.edu>
Fri, 13 Aug 2010 23:23:39 +0000 (17:23 -0600)
commit53fb9f882a6300f96447084c9a53d882786cd734
tree7721077b54acce4761686490ba8f493f90d43dd0
parent74d8640adb88d2775b1b3033db37f4ca24c5e929
Fix merge errors from previous patch
scm/define-music-callbacks.scm
scm/define-music-display-methods.scm
scm/define-music-properties.scm
scm/music-functions.scm