X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcollision-engraver.cc;h=53ec1a343065fa39b16ba7ff553cbe21dddf2874;hb=c3240707ad6a6b03bb9f19732b3c6caada0fb22b;hp=79d66f6c127bd6c41da73cbbc7146fdaab3e0270;hpb=fcc5f76615e024803904a055902fdc6a3b24dccb;p=lilypond.git

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 79d66f6c12..53ec1a3430 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  collision-engraver.cc -- implement Collision_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -71,8 +82,8 @@ ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 
 ADD_TRANSLATOR (Collision_engraver,
 		/* doc */
-		"Collect @code{NoteColumns}, and as soon as there are two or "
-		"more, put them in a @code{NoteCollision} object.",
+		"Collect @code{NoteColumns}, and as soon as there are two or"
+		" more, put them in a @code{NoteCollision} object.",
 
 		/* create */
 		"NoteCollision ",