resolve merge

[lilypond.git] / LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..753f485
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,34 @@
+GNU 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.
+
+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.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+A copy of the license is contained in the file COPYING.
+
+The following exceptions apply:
+
+  * It does not apply to the documentation files (contained in
+    the directory tree Documentation/).  The documentation is
+    covered in the file LICENSE.DOCUMENTATION.
+
+  * It does not apply to ly/articulate.ly, which is only licensed
+    under the GPL version 3 (not any later versions).
+
+  * If you create a document which uses fonts included in LilyPond,
+    and embed this font or unaltered portions of this font into the
+    document, then this font does not by itself cause the resulting
+    document to be covered by the GNU General Public License.  This
+    exception does not however invalidate any other reasons why the
+    document might be covered by the GNU General Public License.
+    If you modify one or more of the fonts, you may extend this
+    exception to your version of the fonts but you are not obliged
+    to do so.  If you do not wish to do so, delete this exception
+    statement from your version.