resolve merge

[lilypond.git] / mf / parmesan-flags.mf

diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf
index 32a55df0e2fd9c4a808f36e71f029c80579a8362..d3d73dec516c7df1cbdefff5a76c845da5e8c459 100644 (file)
--- a/mf/parmesan-flags.mf
+++ b/mf/parmesan-flags.mf
@@ -1,10 +1,21 @@
-% -%-Fundamental-%- -*-Metafont-*-
-% parmesan-flags.mf -- implement ancient flags
-% 
-% source file of LilyPond's pretty-but-neat music font
-% 
-% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
+% Feta (not the Font-En-Tja) music font --  ancient flags
+% This file is part of LilyPond, the GNU music typesetter.
+%
+% Copyright (C) 2001--2011 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/>.
 
 fet_begingroup ("flags");