From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 26 Jul 2007 23:31:58 +0000 (-0700)
Subject: Merge branch 'master' of ssh://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.29-1~40^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=94b710898a8b4c4c07033f676925350b7c6aa7f7;hp=75e13227f5045f1fc1139910acef61a3965ad02c;p=lilypond.git

Merge branch 'master' of ssh://hanwen@git.sv.gnu.org/srv/git/lilypond
---

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index 7661deadaa..f2a452356a 100644
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -108,7 +108,7 @@ in <a class="title" href="user/lilypond.pdf">PDF</a>)
      <br>(on background information)
 
     <li>
-     <a class="title" href="../input/regression/collated-files.html">Regression tests</a> (~ 5 Mb, in <a  class="title" href="../input/regression/collated-files.pdf">PDF</a>, <a href="../test-results.html">comparison</a>)
+     <a class="title" href="../input/regression/collated-files.html">Regression tests</a> (~ 5 Mb, in <a  class="title" href="../input/regression/collated-files.pdf">PDF</a>)
      <br>(for developers)
 
 	</ul>
diff --git a/scm/lily.scm b/scm/lily.scm
index 6f2f09d2e6..bddf997764 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -416,7 +416,7 @@ The syntax is the same as `define*-public'."
     (ly:progress "\nWriting timing to ~a..." outname)
     (format (open-file outname "w")
 	    "time: ~a\ncells: ~a\n"
-	    (if (ly:option 'dump-cpu-profile)
+	    (if (ly:get-option 'dump-cpu-profile)
 		(car diff)
 		0)
 	    (cadr diff)