resolve merge

[lilypond.git] / input / regression / profile-property-access.ly

diff --git a/input/regression/profile-property-access.ly b/input/regression/profile-property-access.ly
index 4502719f68eed6e9fb3d6e5d7129962392d7c095..be8016ffa563e99cdf638ca92326cceaa0254457 100644 (file)
--- a/input/regression/profile-property-access.ly
+++ b/input/regression/profile-property-access.ly
@@ -1,15 +1,16 @@
 % -*- Scheme -*-
 
 \header {
-  texidoc = "This file profiles property accesses; the log file shows the top properties examined."
+  texidoc = "This file profiles property accesses; the log file shows the top properties examined.
+Note: lilypond must be compiled with --disable-optimising for this file to work."
 }
 
 
 #(ly:set-option 'profile-property-accesses #t)
 
-\version "2.12.0"
+\version "2.14.0"
 
-\include "../../input/typography-demo.ly"
+\include "typography-demo.ly"
 %\book { \score { {c4 } } }
 
 #(define (prop-stats>?  x y)