]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0398fdb)
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)
Conflicts resolved in:
python/musicexp.py
python/musicxml.py
scripts/musicxml2ly.py


No differences found
Debian packaging of lilypond