| Index: webrtc/build/ios/merge_ios_libs
|
| diff --git a/talk/build/merge_ios_libs b/webrtc/build/ios/merge_ios_libs
|
| similarity index 71%
|
| rename from talk/build/merge_ios_libs
|
| rename to webrtc/build/ios/merge_ios_libs
|
| index 6d2698bc4294ec91555620e4a5c60b27d8895eb3..d96d5e3c0c69c0b93d7ae6aab39061f939bfca7c 100755
|
| --- a/talk/build/merge_ios_libs
|
| +++ b/webrtc/build/ios/merge_ios_libs
|
| @@ -1,29 +1,12 @@
|
| #!/usr/bin/python
|
| +
|
| +# Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
| #
|
| -# libjingle
|
| -# Copyright 2015 Google Inc.
|
| -#
|
| -# Redistribution and use in source and binary forms, with or without
|
| -# modification, are permitted provided that the following conditions are met:
|
| -#
|
| -# 1. Redistributions of source code must retain the above copyright notice,
|
| -# this list of conditions and the following disclaimer.
|
| -# 2. 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.
|
| -# 3. 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 AUTHOR ``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 AUTHOR 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.
|
| +# Use of this source code is governed by a BSD-style license
|
| +# that can be found in the LICENSE file in the root of the source
|
| +# tree. An additional intellectual property rights grant can be found
|
| +# in the file PATENTS. All contributing project authors may
|
| +# be found in the AUTHORS file in the root of the source tree.
|
|
|
| """Script for merging generated iOS libraries."""
|
|
|
|
|