]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' into philomelos
authorJohn Gourlay <john@weathervanefarm.net>
Fri, 29 Apr 2016 19:47:40 +0000 (15:47 -0400)
committerJohn Gourlay <john@weathervanefarm.net>
Fri, 29 Apr 2016 19:47:40 +0000 (15:47 -0400)
commit0398fdb9df24ac2e22a8cbff1b3c18ca04e9f221
treeec2ba477b4140452a4184c6c7199d021d9ffe552
parent1ad144eca54df3c4e5f43b555c01606e0cfd82b6
parent7d3fa8cb4799303da8e5fd2ead35f1ac32180157
Merge branch 'master' into philomelos

Conflicts resolved in:
python/musicexp.py
python/musicxml.py
scripts/musicxml2ly.py
python/musicexp.py
python/musicxml.py