Merge with master

[lilypond.git] / ly / norsk.ly

diff --git a/ly/norsk.ly b/ly/norsk.ly
index 9bf791d6729806da5d093976cd36accb21e06461..76db0ec2cc5b1b099b3f9cc3323335cb13397190 100644 (file)
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -27,7 +27,7 @@
 
 %}
 
-\pitchnames #`(
+pitchnamesNorsk = #`(
        (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
        (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
        (ces . ,(ly:make-pitch -1 0 FLAT))
@@ -103,5 +103,8 @@
 )
 
 
+pitchnames =\pitchnamesNorsk
 
-\version "1.9.7"
+\version "2.10.0"
+
+#(ly:parser-set-note-names parser pitchnames)