From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 2 Feb 2007 12:12:43 +0000 (+0100)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.16-1~27
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fe3687d66d2a768c83fede50ce901c6ef1b4969e;p=lilypond.git

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

Conflicts:

	lily/tuplet-engraver.cc
---

fe3687d66d2a768c83fede50ce901c6ef1b4969e
diff --cc lily/dynamic-performer.cc
index 47abca1ead,47abca1ead..9b8f366843
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@@ -149,7 -149,7 +149,6 @@@ Dynamic_performer::stop_translation_tim
        finished_span_dynamic_->render ();
        finished_span_dynamic_ = 0;
      }
--
    
    if (absolute_ && absolute_->volume_ < 0)
      {