Upgrade to ExtJS 3.2.0 - Released 03/30/2010

[extjs.git] / license.txt

diff --git a/license.txt b/license.txt
index fa8f86e..68a0fee 100644 (file)
--- a/license.txt
+++ b/license.txt
@@ -1,42 +1,42 @@
-Ext JS - JavaScript Library\r
-Copyright (c) 2006-2009, Ext JS, LLC\r
-All rights reserved.\r
-licensing@extjs.com\r
-\r
-http://extjs.com/license\r
-\r
-Open Source License\r
-------------------------------------------------------------------------------------------\r
-Ext is licensed under the terms of the Open Source GPL 3.0 license. \r
-\r
-http://www.gnu.org/licenses/gpl.html\r
-\r
-There are several FLOSS exceptions available for use with this release for\r
-open source applications that are distributed under a license other than the GPL.\r
-\r
-* Open Source License Exception for Applications\r
-\r
-  http://extjs.com/products/floss-exception.php\r
-\r
-* Open Source License Exception for Development\r
-\r
-  http://extjs.com/products/ux-exception.php\r
-\r
-\r
-Commercial License\r
-------------------------------------------------------------------------------------------\r
-This is the appropriate option if you are creating proprietary applications and you are \r
-not prepared to distribute and share the source code of your application under the \r
-GPL v3 license. Please visit http://extjs.com/license for more details.\r
-\r
-\r
-OEM / Reseller License\r
-------------------------------------------------------------------------------------------\r
-For more details, please visit: http://extjs.com/license.\r
-\r
---\r
-\r
-This library is distributed in the hope that it will be useful,\r
-but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+Ext JS - JavaScript Library
+Copyright (c) 2006-2010, Ext JS, Inc.
+All rights reserved.
+licensing@extjs.com
+
+http://extjs.com/license
+
+Open Source License
+------------------------------------------------------------------------------------------
+Ext is licensed under the terms of the Open Source GPL 3.0 license. 
+
+http://www.gnu.org/licenses/gpl.html
+
+There are several FLOSS exceptions available for use with this release for
+open source applications that are distributed under a license other than the GPL.
+
+* Open Source License Exception for Applications
+
+  http://extjs.com/products/floss-exception.php
+
+* Open Source License Exception for Development
+
+  http://extjs.com/products/ux-exception.php
+
+
+Commercial License
+------------------------------------------------------------------------------------------
+This is the appropriate option if you are creating proprietary applications and you are 
+not prepared to distribute and share the source code of your application under the 
+GPL v3 license. Please visit http://extjs.com/license for more details.
+
+
+OEM / Reseller License
+------------------------------------------------------------------------------------------
+For more details, please visit: http://extjs.com/license.
+
+--
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.