Fixes my bad CVS merge.

[lilypond.git] / COPYING

diff --git a/COPYING b/COPYING
index 6bf77451b9ae2e054e92d3f9b751b2029c556d9a..7e85f1c85d139ba20bd8f1a944bcc27b7e3382a3 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,18 @@
 
-This license applies to all files except the included input files
-which explicitly state a different copyright
 
+*** NOTE
+
+       This license applies to all files that do not explicitly
+specify another license.  This license does not apply to the included
+example input files (which are in the subdirectory input/).
+
+*** END NOTE
 
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+     59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -309,8 +314,8 @@ the "copyright" line and a pointer to where the full notice is found.
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 Also add information on how to contact you by electronic and paper mail.