*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index e6b4b22c5280e61075e2510965662f02f5218518..3bf96d299037afed11d5f19ed9c47cbf9e657b6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 
 2005-08-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/rest-collision.cc (do_shift): spello.
+
        * input/proportional.ly: use #'used property. Set break-overshoot property.
 
        * mf/feta-arrow.mf: arrow tip sticks out of bbox.
@@ -38,7 +40,7 @@
 
 2005-08-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * Nitpick run.
+       * *: Nitpick run.
 
        * buildscripts/fixcc.py: Fixes.
 
@@ -64,7 +66,7 @@
 
 2005-08-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * Remove obsolete files.  Nitpick run.
+       * *: Remove obsolete files.  Nitpick run.
 
        * lily/lily-guile.cc (parse_symbol_list): Bugfix.
 

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index e7d8db4a2d62985754372b6334ac762bbda86e82..8ad587e88bd91a4b1a205821e38091b43780cec7 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -142,7 +142,7 @@ Rest_collision::do_shift (Grob *me)
          if (d)
            ordered_rests[d].push (rests[i]);
          else
-           rests[d]->warning (_ ("can't resolve rest collission: rest direction not set"));
+           rests[d]->warning (_ ("can't resolve rest collision: rest direction not set"));
        }
 
       Direction d = LEFT;