Merge remote-tracking branch 'origin/master' into soc-2014-cycles
[blender.git] / COPYING
diff --git a/COPYING b/COPYING
index 232ee776d872364496fa16568dba5b1ed88ea112..3be7c91320a650eb99fc4ebda1f5fab48c7dbea2 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,11 @@
-Please read over both of the following files:
-doc/GPL-license.txt
-doc/BL-license.txt
+Blender uses the GNU General Public License, which describes the rights
+to distribute or change the code. 
+
+Please read this file for the full license.
+doc/license/GPL-license.txt
+
+Apart from the GNU GPL, Blender is not available under other licenses.
+
+2010, Blender Foundation
+foundation@blender.org
+