diff options
author | Tony Theodore <tonyt@logyst.com> | 2014-04-03 09:43:02 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2014-04-03 09:43:02 (GMT) |
commit | 5c2759eae20acdd4dc80bdbceeb2e05403003484 (patch) | |
tree | 4a4d9cac29e3380f43808734d56114ed75235c92 | |
parent | 53fc67dd8e15255b7b4401cd266a3df2dd099d58 (diff) | |
parent | 37f60b6cb782a5a60a6b837922f6df81ddc5ed68 (diff) | |
download | mxe-5c2759eae20acdd4dc80bdbceeb2e05403003484.zip mxe-5c2759eae20acdd4dc80bdbceeb2e05403003484.tar.gz mxe-5c2759eae20acdd4dc80bdbceeb2e05403003484.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | index.html | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2929,12 +2929,12 @@ endef</pre> <p> The definition of free must be one of: + </p> <ul> <li><a href="http://www.gnu.org/philosophy/free-sw.html">The Free Software Definition</a></li> <li><a href="http://www.debian.org/social_contract#guidelines">The Debian Free Software Guidelines (DFSG)</a></li> <li><a href="http://www.opensource.org/osd.html">The Open Source Definition</a></li> </ul> - </p> <p> Please contact the @@ -2966,11 +2966,11 @@ endef</pre> <p> For these packages, we will provide sensible defaults aimed at achieving the following goals: + </p> <ol> <li>avoid causing inherent licensing issues with conflicting options</li> <li>make the package as feature complete as possible</li> </ol> - </p> <p> Note that this does not prevent downstream violations, or affect any |