From: David Kastrup <dak@gnu.org>
Date: Mon, 22 Oct 2012 13:39:47 +0000 (+0200)
Subject: Merge branch 'translation' into staging
X-Git-Tag: release/2.17.6-1~46
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=cb951038d3e74a85ec8539d0dc51260088251556

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
---

cb951038d3e74a85ec8539d0dc51260088251556