зеркало из https://github.com/mozilla/pjs.git
Bug 731193 - Update Microsoft "DirectX" licence in about:license to list all
shipped MS DLLs and give it a more generic name. r=villalu.
This commit is contained in:
Родитель
dc1aed3edd
Коммит
5be3d5c1e6
|
@ -110,7 +110,7 @@
|
|||
<li><a href="about:license#other-notices">Other Required Notices</a>
|
||||
<li><a href="about:license#optional-notices">Optional Notices</a>
|
||||
#ifdef XP_WIN
|
||||
<li><a href="about:license#proprietary-notices">Proprietary Operating System Libraries</a>
|
||||
<li><a href="about:license#proprietary-notices">Proprietary Operating System Components</a>
|
||||
#endif
|
||||
</ul>
|
||||
|
||||
|
@ -2676,30 +2676,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
that specific operating system. The following license statements
|
||||
apply to such inclusions.</p>
|
||||
|
||||
<h2><a id="directx"></a>Microsoft Windows: Microsoft DirectX License</h2>
|
||||
<h2><a id="directx"></a>Microsoft Windows: Terms for 'Microsoft Distributable Code'</h2>
|
||||
|
||||
<p>This license applies to the following files;
|
||||
<p>These terms apply to the following files;
|
||||
they are referred to below as "Distributable Code":
|
||||
<span class="path">d3dx9_*.dll</span> and <span class="path">d3dcompiler_*.dll</span>.</p>
|
||||
<ul>
|
||||
<li><span class="path">d3d*.dll</span> (Direct3D libraries)</li>
|
||||
<li><span class="path">msvc*.dll</span> (C and C++ runtime libraries)</li>
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
<pre>
|
||||
Copyright (c) Microsoft Corporation.
|
||||
|
||||
The Distributable Code may be used and distributed only if you comply with the
|
||||
following terms: (i) You may use, copy, and distribute the Distributable Code
|
||||
only as part of this product; (ii) You may not use the Distributable Code on a
|
||||
platform other than Windows; (iii) You may not alter any copyright, trademark
|
||||
or patent notice in the Distributable Code; (iv) You may not modify or
|
||||
distribute the source code of any Distributable Code so that any part of the
|
||||
source code becomes subject to the MPL or any other copyleft license; (v) You
|
||||
must comply with any technical limitations in the Distributable Code that only
|
||||
allow you to use it in certain ways; and (vi) You must comply with all domestic
|
||||
and international export laws and regulations that apply to the Distributable
|
||||
Code.
|
||||
following terms:
|
||||
|
||||
(i) You may use, copy, and distribute the Distributable Code only as part of
|
||||
this product;
|
||||
(ii) You may not use the Distributable Code on a platform other than Windows;
|
||||
(iii) You may not alter any copyright, trademark or patent notice in the
|
||||
Distributable Code;
|
||||
(iv) You may not modify or distribute the source code of any Distributable
|
||||
Code so that any part of the source code becomes subject to the MPL or
|
||||
any other copyleft license;
|
||||
(v) You must comply with any technical limitations in the Distributable Code
|
||||
that only allow you to use it in certain ways; and
|
||||
(vi) You must comply with all domestic and international export laws and
|
||||
regulations that apply to the Distributable Code.
|
||||
</pre>
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче