resolve merge

[lilypond.git] / flower / polynomial.cc

diff --git a/flower/polynomial.cc b/flower/polynomial.cc
index b34700b2d0d77dadf92a32d66074926708499e30..1530baee83e6c7ca00052394e600f9bbf3d04aad 100644 (file)
--- a/flower/polynomial.cc
+++ b/flower/polynomial.cc
@@ -1,7 +1,20 @@
 /*
-  poly.cc -- routines for manipulation of polynomials in one var
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1993--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1993--2011 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 "polynomial.hh"