* Bug #4649 fixed - Fix a license issues in the xs2ppm help page. 14/13214/2
Sylvestre Ledru [Fri, 22 Nov 2013 17:20:15 +0000 (18:20 +0100)]
Change-Id: I000eaf2894f4f62a0ea8374483460d0b21d8c5c9

scilab/CHANGES_5.5.X
scilab/modules/graphic_export/help/en_US/xs2ppm.xml

index 9309f9f..c5c8ab5 100644 (file)
@@ -34,6 +34,8 @@ Scilab Bug Fixes
 
 * Bug #4401 fixed - isnum did not recognize all constants or some complex numbers.
 
+* Bug #4649 fixed - Fix a license issue in the xs2ppm help page.
+
 * Bug #4965 fixed - Setting links property for a handle of type legend did not work.
 
 * Bug #5016 fixed - condestsp could return different results when repeated calls were performed.
index b8e806d..7270803 100644 (file)
         </para>
     </refsection>
     <refsection>
+        <title>License</title>
+        <para>
+            The code of PPM is based on the work of Jef Poskanzer (Copyright (C)1996,1998) All rights reserved.
+        </para>
+        <para>
+            Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions
+            are met:
+        </para>
+        <para>
+            1. Redistributions of source code must retain the above copyright
+            notice, this list of conditions and the following disclaimer.
+        </para>
+        <para>
+            2. Redistributions in binary form must reproduce the above copyright
+            notice, this list of conditions and the following disclaimer in the
+            documentation and/or other materials provided with the distribution.
+        </para>
+    </refsection>
+    
+    <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[ 
 scf(0)