resolve merge

[lilypond.git] / lily / ligature-bracket-engraver.cc

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 34218968316a2bd2131034949779348576cb10af..b467ec998a3a16383da42f0f648af9b8fbe36a86 100644 (file)
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -1,19 +1,29 @@
 /*
-  ligature-bracket-engraver.cc -- implement Ligature_bracket_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
+  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 "international.hh"
 
-#include "ligature-engraver.hh"
+#include "engraver.hh"
 #include "note-column.hh"
 #include "tuplet-bracket.hh"
 #include "spanner.hh"
 #include "stream-event.hh"
-#include "spanner.hh"
 #include "item.hh"
 
 #include "translator.icc"