From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 25 Jan 2007 19:10:29 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.15-1~9^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2819ba86363def7f615b7fbbf03aecef761296c6;p=lilypond.git

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

Conflicts:

	lily/page-breaking.cc
---

2819ba86363def7f615b7fbbf03aecef761296c6
diff --cc lily/constrained-breaking.cc
index 9eaa3d6c6e,a4f3ac4b57..33426c0b3f
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@@ -262,9 -272,9 +262,9 @@@ Constrained_breaking::min_system_count 
  }
  
  int
 -Constrained_breaking::get_max_systems (vsize start, vsize end)
 +Constrained_breaking::max_system_count (vsize start, vsize end)
  {
-   vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end];
+   vsize brk = (end >= start_.size ()) ? breaks_.size () : starting_breakpoints_[end];
    return brk - starting_breakpoints_[start];
  }