Permalink
Browse files

Simplified license.

  • Loading branch information...
1 parent 3a58c57 commit 1c774e92d7afb0e777c1711f89ee6d7d6a23b0d4 @tschaub tschaub committed Oct 23, 2010
Showing with 36 additions and 54 deletions.
  1. +9 −9 README.md
  2. +0 −44 ext-license.js
  3. +26 −0 ext-license.txt
  4. +1 −1 jsbuild.cfg
View
@@ -4,15 +4,6 @@ A web based editor for managing earthquake related spatial data.
Developed by [OpenGeo](http://opengeo.org/) in support of the [Global Earthquake Model](http://www.globalquakemodel.org/).
-## Development
-
-Get set up for development with the following:
-
- git clone git@github.com:opengeo/FaultedEarth.git
- cd FaultedEarth
- git submodule init
- git submodule update
-
## Running and deploying GeoEditor
These instructions describe how to deploy GeoEditor assuming you have a copy of the application archive (GeoEditor.zip).
@@ -61,3 +52,12 @@ If you want to add the "topp:states" layer to the layers that are initially disp
// ...
});
+## Development
+
+Get set up for development with the following:
+
+ git clone git@github.com:opengeo/FaultedEarth.git
+ cd FaultedEarth
+ git submodule init
+ git submodule update
+
View
@@ -1,44 +0,0 @@
-/*
-Ext JS - JavaScript Library
-Copyright (c) 2006-2009, Ext JS, LLC
-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.
-*/
View
@@ -0,0 +1,26 @@
+/*
+Ext JS - JavaScript Library
+Copyright (c) 2006-2010, Sencha, Inc.
+All rights reserved.
+licensing@www.sencha.com
+
+http://www.sencha.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://www.sencha.com/products/floss-exception.php
+
+* Open Source License Exception for Development
+
+ http://www.sencha.com/products/ux-exception.php
+
+*/
View
@@ -93,4 +93,4 @@ exclude = loader.js
[ux.js]
root = src/script/ux
-license = ext-license.js
+license = ext-license.txt

0 comments on commit 1c774e9

Please sign in to comment.