diff options
| author | Shawn Pearce <sop@google.com> | 2013-05-13 09:21:42 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-05-13 09:21:42 -0700 |
| commit | b95d35bcd7a4adcdf1a2a94ed3199ac8d6913e23 (patch) | |
| tree | 207192d04e830dd836decc4b094e6a16c2a64a15 /Documentation | |
| parent | 98cd151eb122435eecec3c22b84ef145d58f1d5b (diff) | |
| parent | 57b44b0cd9491af415097bf195ef695d45bd9786 (diff) | |
Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Add statement about source code availability for Prolog Cafe
Clarify that we consume Prolog Cafe under the EPL
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/licenses.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt index 02b7a3dc46..fbdd9cd33f 100644 --- a/Documentation/licenses.txt +++ b/Documentation/licenses.txt @@ -407,7 +407,8 @@ Prolog Cafe - EPL or GPL Originally developed by Mutsunori BANBARA and Naoyuki TAMURA at the Kobe University, JAPAN. Gerrit Code Review uses a fork derived from -the 1.2.5 release. +the 1.2.5 release, and offers the corresponding source code at +link:https://gerrit.googlesource.com/prolog-cafe[]. Prolog Cafe is dual licensed and available under either the link:http://opensource.org/licenses/eclipse-1.0.php[Eclipse Public License], @@ -415,8 +416,7 @@ or the link:http://www.gnu.org/licenses/gpl-2.0.html[GPL version 2.0 (or later)]. In the context of Gerrit Code Review, Prolog Cafe is consumed -under either the EPL or GPL version 3.0 as GPL version 2.0 is -not compatible with Apache License 2.0. +under the EPL. [[h2]] H2 Database - EPL or modified MPL |