From d0ab137f35caf66f7202cd2d7724c72eac092285 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 15 Aug 2005 15:37:21 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 6 ++++-- lily/rest-collision.cc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6b4b22c52..3bf96d2990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ 2005-08-15 Han-Wen Nienhuys + * 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 - * Nitpick run. + * *: Nitpick run. * buildscripts/fixcc.py: Fixes. @@ -64,7 +66,7 @@ 2005-08-12 Jan Nieuwenhuizen - * 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 e7d8db4a2d..8ad587e88b 100644 --- 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; -- 2.39.2