From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 3 Nov 2006 00:54:00 +0000 (+0100)
Subject: Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master... 
X-Git-Tag: release/2.10.0-2~34^2~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1aa6d40d595d25202bd7b5ce82edf320845dc7a4;p=lilypond.git

Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

Conflicts:

	.gitignore
	input/regression/utf-8.ly
---

1aa6d40d595d25202bd7b5ce82edf320845dc7a4
diff --cc input/regression/utf-8.ly
index 3a4cb6c39c,a9b4179fac..4a82eab24b
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@@ -45,6 -38,13 +38,13 @@@ hebrew = \lyricmode 
    זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
  }
  
+ japanese = \lyricmode {  
+   いろはにほへど ちりぬるを
+   わがよたれぞ  つねならむ
+   うゐのおくや  まけふこえて
+   あさきゆめみじ ゑひもせず 
 - }
++}
+ 
  % "a legal song to you"
  portuguese = \lyricmode { 
    à vo cê uma can ção legal