This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-editor.git
commit 856a027bb6614043e8f5fc31a9eca58ed48321b6 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Fri Nov 21 15:04:43 2014 +0000 SLING-4170 - LICENSE/NOTICE reorganization, contributed by Sandro Boehme, thanks! git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1640929 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE.txt | 43 ++++++++++++++++++++++++++++++++++++++++++- NOTICE | 40 ---------------------------------------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 2bb9ad2..f085ef0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -173,4 +173,45 @@ incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - END OF TERMS AND CONDITIONS \ No newline at end of file + END OF TERMS AND CONDITIONS + + + ++++ Third party libraries +++ + +++ Apache Sling - http://sling.apache.org/ ++ +Apache 2 license from http://www.apache.org/licenses/LICENSE-2.0.html + +++ Twitter Bootstrap - http://getbootstrap.com/ +MIT License from http://opensource.org/licenses/MIT + +++ Glyphicons included in Twitter Bootstrap ++ +http://glyphicons.com/license/ states that the version that is included in Twitter Bootstrap uses the same license as Twitter Bootstrap. + +++ Bootbox - http://bootboxjs.com/ ++ +MIT License from http://opensource.org/licenses/MIT + +++ Google Webfonts - http://www.google.com/webfonts ++ +Quote from the about page at http://www.google.com/webfonts#AboutPlace:about +All of the fonts are Open Source. This means that you are free to share your favorites with friends and colleagues. You can even customize them for your own use, or collaborate with the original designer to improve them. And you can use them in every way you want, privately or commercially ��������� in print, on your computer, or in your websites. + +++ Less CSS compiler - http://lesscss.org/ ++ +Apache 2 license from http://www.apache.org/licenses/LICENSE-2.0.html + +++ jQuery - http://jquery.org/ ++ +MIT License from http://opensource.org/licenses/MIT + +++ jQuery scrollTo plugin - http://flesler.blogspot.com/2007/10/jqueryscrollto.html ++ +MIT License from http://opensource.org/licenses/MIT + +++ The background image img/alu.gif - http://www.grsites.com/archive/textures/view/source=archive/id=2237 ++ +Attribution from http://www.apache.org/licenses/LICENSE-2.0.html + +++ Animate.css - https://github.com/daneden/animate.css ++ +MIT License from http://opensource.org/licenses/MIT + +++ jsTree - http://www.jstree.com ++ +MIT License from http://opensource.org/licenses/MIT + +++ Select2 - http://ivaynberg.github.io/select2/ ++ +Apache2 License from https://github.com/ivaynberg/select2/blob/master/LICENSE \ No newline at end of file diff --git a/NOTICE b/NOTICE deleted file mode 100644 index bb2457d..0000000 --- a/NOTICE +++ /dev/null @@ -1,40 +0,0 @@ -Sling Resource Editor -Copyright 2014 Apache Software Foundation - -+++ Third party libraries +++ - -++ Apache Sling - http://sling.apache.org/ ++ -Apache 2 license from http://www.apache.org/licenses/LICENSE-2.0.html - -++ Twitter Bootstrap - http://getbootstrap.com/ -MIT License from http://opensource.org/licenses/MIT - -++ Glyphicons included in Twitter Bootstrap ++ -http://glyphicons.com/license/ states that the version that is included in Twitter Bootstrap uses the same license as Twitter Bootstrap. - -++ Bootbox - http://bootboxjs.com/ ++ -MIT License from http://opensource.org/licenses/MIT - -++ Google Webfonts - http://www.google.com/webfonts ++ -Quote from the about page at http://www.google.com/webfonts#AboutPlace:about -All of the fonts are Open Source. This means that you are free to share your favorites with friends and colleagues. You can even customize them for your own use, or collaborate with the original designer to improve them. And you can use them in every way you want, privately or commercially ��� in print, on your computer, or in your websites. - -++ Less CSS compiler - http://lesscss.org/ ++ -Apache 2 license from http://www.apache.org/licenses/LICENSE-2.0.html - -++ jQuery - http://jquery.org/ ++ -MIT License from http://opensource.org/licenses/MIT - -++ jQuery scrollTo plugin - http://flesler.blogspot.com/2007/10/jqueryscrollto.html ++ -MIT License from http://opensource.org/licenses/MIT - -++ The background image img/alu.gif - http://www.grsites.com/archive/textures/view/source=archive/id=2237 ++ -Attribution from http://www.apache.org/licenses/LICENSE-2.0.html - -++ Animate.css - https://github.com/daneden/animate.css ++ -MIT License from http://opensource.org/licenses/MIT - -++ jsTree - http://www.jstree.com ++ -MIT License from http://opensource.org/licenses/MIT - - \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
