]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'translation' into staging
authorDavid Kastrup <dak@gnu.org>
Mon, 22 Oct 2012 13:39:47 +0000 (15:39 +0200)
committerDavid Kastrup <dak@gnu.org>
Mon, 22 Oct 2012 13:39:47 +0000 (15:39 +0200)
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:
1  2 
Documentation/de/notation/ancient.itely
Documentation/de/notation/changing-defaults.itely
Documentation/de/notation/notation-appendices.itely
Documentation/de/notation/rhythms.itely
Documentation/de/notation/spacing.itely
Documentation/de/notation/vocal.itely
Documentation/es/notation/ancient.itely
Documentation/es/notation/changing-defaults.itely
Documentation/es/notation/notation-appendices.itely
Documentation/es/notation/rhythms.itely
Documentation/es/notation/spacing.itely
Documentation/es/notation/vocal.itely
Documentation/fr/notation/ancient.itely
Documentation/fr/notation/changing-defaults.itely
Documentation/fr/notation/notation-appendices.itely
Documentation/fr/notation/rhythms.itely
Documentation/fr/notation/spacing.itely
Documentation/fr/notation/vocal.itely

Simple merge
Simple merge
Simple merge