UPdated LICENCE to reflect r.js and added MIT header to r.js git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1552406 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/00988b9b Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/00988b9b Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/00988b9b Branch: refs/heads/angular Commit: 00988b9b7fb82c50a63bbdd49eaaf489d584b116 Parents: 8dc1251 Author: Matthew B. Franklin <[email protected]> Authored: Thu Dec 19 19:47:58 2013 +0000 Committer: Matthew B. Franklin <[email protected]> Committed: Thu Dec 19 19:47:58 2013 +0000 ---------------------------------------------------------------------- LICENSE | 27 ++++++++++++++++++++++ rave-portal-resources/src/main/resources/r.js | 8 +++++++ 2 files changed, 35 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/00988b9b/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index d645695..c2f9036 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,30 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + +====================================================================================== +MIT License + +For r.js +====================================================================================== + +Copyright (c) 2010-2013, The Dojo Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/rave/blob/00988b9b/rave-portal-resources/src/main/resources/r.js ---------------------------------------------------------------------- diff --git a/rave-portal-resources/src/main/resources/r.js b/rave-portal-resources/src/main/resources/r.js index 46975f8..88b3538 100644 --- a/rave-portal-resources/src/main/resources/r.js +++ b/rave-portal-resources/src/main/resources/r.js @@ -1,4 +1,12 @@ /** + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * * @license r.js 2.1.6 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details
