resolve merge

[lilypond.git] / scripts / lilymidi.py

diff --git a/scripts/lilymidi.py b/scripts/lilymidi.py
index b8481b3457d5e54ea72d193270f6ce2e919f8f12..73809a4d4d9f227591ded8fbfb0a63664f9e8226 100644 (file)
--- a/scripts/lilymidi.py
+++ b/scripts/lilymidi.py
@@ -1,25 +1,23 @@
 #!@TARGET_PYTHON@
 
-# Copyright (c) 2006--2009 Brailcom, o.p.s.
+# Copyright (C) 2006--2011 Brailcom, o.p.s.
 #
 # Author: Milan Zamazal <pdm@brailcom.org>
 #
-# COPYRIGHT NOTICE
+# This file is part of LilyPond, the GNU music typesetter.
 #
-# This program is free software; you can redistribute it and/or modify
+# 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 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program 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.
+# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
-
+# along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 import optparse
 import os