summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2010-12-08 14:33:25 +0100
committerOlivier Dony <odo@openerp.com>2010-12-08 14:33:25 +0100
commita970c497a684cc88d14070d1e929d771dcc61705 (patch)
tree0e9f21f2652f82161aaf2a1ae58f1bac583bf7d9
parent14b7e37bf5d01391a34b09baff483528ea4cbf66 (diff)
[IMP] license: renamed general license file, and included note about other applicable licenses
bzr revid: odo@openerp.com-20101208133325-rlrtmzao8kzdp31o
-rw-r--r--LICENSE (renamed from bin/agpl.txt)8
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/agpl.txt b/LICENSE
index dba13ed2ddf..ca3163bb5c2 100644
--- a/bin/agpl.txt
+++ b/LICENSE
@@ -1,3 +1,11 @@
+OpenERP v6.0 is published under the GNU AFFERO GENERAL PUBLIC LICENSE,
+Version 3 (AGPLv3), as included below. Some external libraries and
+contributions bundled with OpenERP may be published under other
+AGPLv3-compatible licenses. For these, please refer to the relevant
+source files and/or license files, in the source code tree.
+
+**************************************************************************
+
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007