opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Add statement about source code availability for Prolog Cafe
  Clarify that we consume Prolog Cafe under the EPL
This commit is contained in:
Shawn Pearce
2013-05-13 09:21:42 -07:00
parent 98cd151eb1 57b44b0cd9
commit b95d35bcd7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/licenses.txt
View File

@@ -407,7 +407,8 @@ Prolog Cafe - EPL or GPL
Originally developed by Mutsunori BANBARA and Naoyuki TAMURA at the Originally developed by Mutsunori BANBARA and Naoyuki TAMURA at the
Kobe University, JAPAN. Gerrit Code Review uses a fork derived from 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 Prolog Cafe is dual licensed and available under either the
link:http://opensource.org/licenses/eclipse-1.0.php[Eclipse Public License], 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)]. 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 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 under the EPL.
not compatible with Apache License 2.0.
[[h2]] [[h2]]
H2 Database - EPL or modified MPL H2 Database - EPL or modified MPL