resolve merge

[lilypond.git] / lily / breathing-sign-engraver.cc

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index b65131579fb6769dedec81720ebb525abe1b7d84..4e583881c0dd0dccfc941cee563d33606ffa5724 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -1,15 +1,26 @@
 /*
-  breathing_sign-engraver.cc -- implement Breathing_sign_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1999--2009 Michael Krause
+  Copyright (C) 1999--2011 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
   TODO:
 
-  . Cancel any beams running through the breathing sign
-  ([e8 \breathe f e f] should become [e8] \breathe [f e f])
   . Spacing is not yet completely pretty
+
+  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 "breathing-sign.hh"