resolve merge

[lilypond.git] / lily / include / midi-stream.hh

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 6b9bd0c5732a98983991c36d4780e7674821ed55..de719d2991b74862a689b3f0c717b51fe81edf01 100644 (file)
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,7 +1,20 @@
 /*
-  midi-stream.hh -- declare Midi_stream
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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/>.
 */
 
 #ifndef MIDI_STREAM_HH