osstool 1.29

1 files changed, 49 insertions, 22 deletions

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index ed7e5acda34..757d3800253 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -60,13 +60,12 @@ This project incorporates components from the projects listed below. The origina
 53.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
 54.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
 55.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
-56.	textmate/toml.tmbundle (https://github.com/textmate/toml.tmbundle)
-57.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
-58.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
-59.	Unicode ()
-60.	vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
-61.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
-62.	Web Background Synchronization (https://github.com/WICG/BackgroundSync)
+56.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
+57.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
+58.	Unicode ()
+59.	vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
+60.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
+61.	Web Background Synchronization (https://github.com/WICG/BackgroundSync)
 
 
 %% atom/language-c NOTICES AND INFORMATION BEGIN HERE
@@ -1282,7 +1281,49 @@ END OF MagicStack/MagicPython NOTICES AND INFORMATION
 
 %% marked NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright (c) 2011-2018, Christopher Jeffrey. (MIT License)
+information
+
+## Contribution License Agreement
+
+If you contribute code to this project, you are implicitly allowing your code
+to be distributed under the MIT license. You are also implicitly verifying that
+all code is your original work. `</legalese>`
+
+## Marked
+
+Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
+
+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.
+
+## Markdown
+
+Copyright © 2004, John Gruber
+http://daringfireball.net/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name "Markdown" nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in 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.
 =========================================
 END OF marked NOTICES AND INFORMATION
 
@@ -2180,20 +2221,6 @@ to the base-name name of the original file, and an extension of txt, html, or si
 =========================================
 END OF textmate/ruby.tmbundle NOTICES AND INFORMATION
 
-%% textmate/toml.tmbundle NOTICES AND INFORMATION BEGIN HERE
-=========================================
-Copyright (c) https://github.com/infininight and https://github.com/mojombo
-Permission to copy, use, modify, sell and distribute this
-software is granted. This software is provided "as is" without
-express or implied warranty, and with no claim as to its
-suitability for any purpose
-
-An exception is made for files in readable text which contain their own license information, or files where an accompanying
-file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension .
-of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt".
-=========================================
-END OF textmate/toml.tmbundle NOTICES AND INFORMATION
-
 %% textmate/yaml.tmbundle NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>