]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'fixedtranslation' into HEAD
authorDavid Kastrup <dak@gnu.org>
Wed, 7 Mar 2012 21:18:21 +0000 (22:18 +0100)
committerDavid Kastrup <dak@gnu.org>
Wed, 7 Mar 2012 21:20:50 +0000 (22:20 +0100)
Conflicts:
Documentation/changes.tely
Documentation/web/news-front.itexi
VERSION
input/regression/layout-from.ly
lily/context-def.cc

1  2 
Documentation/web/community.itexi
lily/book-scheme.cc
lily/parser.yy
ly/engraver-init.ly
ly/music-functions-init.ly
scm/lily-library.scm

Simple merge
Simple merge
diff --cc lily/parser.yy
Simple merge
Simple merge
Simple merge
Simple merge