diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-16 18:04:56 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-16 18:04:56 +0000 |
| commit | 7b2f955e565a64d182b25ae3763b09b60fc682b8 (patch) | |
| tree | 04dea820f742fa67418f5918a3b872e6c0d2a6f1 | |
| parent | 42581545ebf930b4339c6a94d70da8cc731b66cd (diff) | |
| download | webrtc-7b2f955e565a64d182b25ae3763b09b60fc682b8.tar.gz | |
Libjingle in webrtc needs updated AUTHORS, COPYING, LICENSE_THIRD_PARTY AND README.
BUG=1935
R=andrew@webrtc.org, fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1805005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4356 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | AUTHORS | 19 | ||||
| -rw-r--r-- | COPYING | 1 | ||||
| -rw-r--r-- | LICENSE_THIRD_PARTY | 2 | ||||
| -rw-r--r-- | talk/COPYING | 25 | ||||
| -rw-r--r-- | talk/LICENSE_THIRD_PARTY | 29 |
5 files changed, 68 insertions, 8 deletions
@@ -1,14 +1,19 @@ # Names should be added to this file like so: # Name or Organization <email address> +Anil Kumar <an1kumar@gmail.com> +Ben Strong <bstrong@gmail.com> +Eric Rescorla, RTFM Inc. +Jie Mao <maojie0924@gmail.com> +Luke Weber +Martin Storsjo <martin@martin.st> +Pali Rohar +Robert Nagy +Silviu Caragea <silviu.cpp@gmail.com> + Google Inc. -Mozilla Foundation Intel Corporation -Vonage Holdings Corp. MIPS Technologies -Ben Strong <bstrong@gmail.com> -Martin Storsjo <martin@martin.st> -Jie Mao <maojie0924@gmail.com> -Anil Kumar <an1kumar@gmail.com> +Mozilla Foundation Opera Software ASA -Silviu Caragea <silviu.cpp@gmail.com> +Vonage Holdings Corp. diff --git a/COPYING b/COPYING new file mode 100644 index 0000000000..fba26f457a --- /dev/null +++ b/COPYING @@ -0,0 +1 @@ +Refer to talk/COPYING.
\ No newline at end of file diff --git a/LICENSE_THIRD_PARTY b/LICENSE_THIRD_PARTY index 2281c656dd..dfcf6e45f8 100644 --- a/LICENSE_THIRD_PARTY +++ b/LICENSE_THIRD_PARTY @@ -1 +1 @@ -Refer to webrtc/LICENSE_THIRD_PARTY. +Refer to webrtc/LICENSE_THIRD_PARTY and talk/LICENSE_THIRD_PARTY. diff --git a/talk/COPYING b/talk/COPYING new file mode 100644 index 0000000000..ba0bffa0c5 --- /dev/null +++ b/talk/COPYING @@ -0,0 +1,25 @@ +Copyright (c) 2013, Google Inc. +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. + * The name of the author may not 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.
\ No newline at end of file diff --git a/talk/LICENSE_THIRD_PARTY b/talk/LICENSE_THIRD_PARTY new file mode 100644 index 0000000000..0423fdbb87 --- /dev/null +++ b/talk/LICENSE_THIRD_PARTY @@ -0,0 +1,29 @@ +This source tree contains third party source code which is governed by third +party licenses. This file contains references to files which are under other +licenses than the one provided in the COPYING file in the root of the source +tree. + +Files governed by third party licenses: + +Governed by license within files (Public domain): +Exact origin unknown +base/base64.c +base/base64.h + +Governed by http://www.fourmilab.ch/md5/ (Public domain): +base/md5.c +base/md5.h + +Governed by http://www.boost.org/LICENSE_1_0.txt (Boost license): +base/scoped_ptr.h + +Governed by license within files (Public domain): +Originally downloaded from http://svn.ghostscript.com/jbig2dec/tags/release_0_02/sha1.* +base/sha1.c +base/sha1.h + +Governed by http://sigslot.sourceforge.net/#license (Public domain): +base/sigslot.h + +Governed by http://www.freedesktop.org/wiki/Software/systemd (LGPL 2.1+): +third_party/libudev/libudev.h
\ No newline at end of file |