]> git.donarmstrong.com Git - lilypond.git/commit - stepmake/stepmake/texinfo-rules.make
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)
commit2944a83e59f487894a214769392ce27289accb71
tree246a237241c28ca78f1935a42c5a54341617e995
parent9d1520b21710bd22872010ae9aa4c4899014e9d4
parent569714401fbe0e814f0282059f157aa36a54c706
Merge branch 'fixedtranslation' into HEAD

Conflicts:
Documentation/changes.tely
Documentation/web/news-front.itexi
VERSION
input/regression/layout-from.ly
lily/context-def.cc
Documentation/web/community.itexi
lily/book-scheme.cc
lily/parser.yy
ly/engraver-init.ly
ly/music-functions-init.ly
scm/lily-library.scm