]>
git.donarmstrong.com Git - lilypond.git/commit - lily/include/stencil.hh
Merge branch 'translation' into staging
Conflicts have been resolved generally by taking the version in
master, with the exception of Documentation/fr/notation/ancient.itely
requiring a more elaborate merge.
Conflicts:
Documentation/de/search-box.ihtml
Documentation/es/search-box.ihtml
Documentation/es/web/news-front.itexi
Documentation/fr/notation/ancient.itely
Documentation/fr/search-box.ihtml
Documentation/hu/search-box.ihtml
Documentation/included/authors.itexi
Documentation/it/search-box.ihtml
Documentation/nl/search-box.ihtml
Documentation/search-box.ihtml
Documentation/snippets/adding-timing-marks-to-long-glissandi.ly
Documentation/snippets/making-glissandi-breakable.ly
Documentation/snippets/new/adding-timing-marks-to-long-glissandi.ly
Documentation/snippets/new/making-glissandi-breakable.ly
Documentation/zh/search-box.ihtml
VERSION
configure.in
input/regression/repeat-sign-global-size-10.ly
input/regression/repeat-sign-global-size-30.ly
input/regression/repeat-sign-global-size-5.ly
input/regression/tablature-repeat.ly
lily/lily-parser.cc
lily/parser.yy
scm/bar-line.scm
18 files changed: