resolve merge

[lilypond.git] / flower / getopt-long.cc

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 5d8b4259f308e6b32cf02daa8a8667dcca7005ed..51e11d896c3908ba0056ce71894e0f1942095f65 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -1,7 +1,20 @@
 /*
-  process command line, GNU style.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  this is Copyleft (c) 1996--2009 Han-Wen Nienhuys, <hanwen@xs4all.nl>
+  Copyright (C) 1996--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 "getopt-long.hh"