You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/04/14 18:17:20 UTC

svn commit: r764860 - /incubator/pivot/branches/1.1/LICENSE

Author: tvolkert
Date: Tue Apr 14 16:17:20 2009
New Revision: 764860

URL: http://svn.apache.org/viewvc?rev=764860&view=rev
Log:
Cross-port of LICENSE file

Modified:
    incubator/pivot/branches/1.1/LICENSE

Modified: incubator/pivot/branches/1.1/LICENSE
URL: http://svn.apache.org/viewvc/incubator/pivot/branches/1.1/LICENSE?rev=764860&r1=764859&r2=764860&view=diff
==============================================================================
--- incubator/pivot/branches/1.1/LICENSE (original)
+++ incubator/pivot/branches/1.1/LICENSE Tue Apr 14 16:17:20 2009
@@ -268,3 +268,20 @@
   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
+
+For the silk icons:
+
+  You are free:
+  * to Share — to copy, distribute and transmit the work
+  * to Remix — to adapt the work
+
+  Under the following conditions:
+  * Attribution. You must attribute the work in the manner specified by the
+    author or licensor (but not in any way that suggests that they endorse
+    you or your use of the work).
+  * For any reuse or distribution, you must make clear to others the license
+    terms of this work. The best way to do this is with a link to this web
+    page.
+  * Any of the above conditions can be waived if you get permission from the
+    copyright holder.
+  * Nothing in this license impairs or restricts the author's moral rights.