diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-25 07:42:39 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-25 07:42:39 -0400 |
commit | 5573df3013e686c69798caa01c9eafcbb553601c (patch) | |
tree | 9e38700cb7d4be42c310fe6f7234d5bd7268b858 | |
parent | 6a4a73c2d37aa147e0aa2e157ca78ed275ef822b (diff) | |
parent | 737e48dce3dc8d839d0914f6614ae86e5ee545a1 (diff) | |
download | chat-5573df3013e686c69798caa01c9eafcbb553601c.tar.gz chat-5573df3013e686c69798caa01c9eafcbb553601c.tar.bz2 chat-5573df3013e686c69798caa01c9eafcbb553601c.zip |
Merge pull request #792 from esethna/patch-2
Update NOTICE.txt to include emoji license info V2
-rw-r--r-- | NOTICE.txt | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/NOTICE.txt b/NOTICE.txt index f31472477..dafc6d257 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -724,6 +724,46 @@ Legal Terms Our home page can be found at http://www.freetype.org + +--- end of FTL.TXT --- + +--- +This product contains a modified portion of 'gemoji', a collection of emoji images and names by Apple Inc. and other contributors. ---- end of FTL.TXT --- +* HOMEPAGE: + * https://github.com/github/gemoji/blob/master/LICENSE + +* LICENSE: + +octocat, squirrel, shipit +Copyright (c) 2013 GitHub Inc. All rights reserved. + +bowtie, neckbeard, fu +Copyright (c) 2013 37signals, LLC. All rights reserved. + +feelsgood, finnadie, goberserk, godmode, hurtrealbad, rage 1-4, suspect +Copyright (c) 2013 id Software. All rights reserved. + +trollface +Copyright (c) 2013 whynne@deviantart. All rights reserved. + +All other images +Copyright (c) 2013 Apple Inc. All rights reserved. + +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. |