Remove unneeded .rej files from libwebrtc
authoryouenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Oct 2018 18:07:26 +0000 (18:07 +0000)
committeryouenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Oct 2018 18:07:26 +0000 (18:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=190670

Reviewed by Mark Lam.

* Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE.rej: Removed.
* Source/third_party/boringssl/src/third_party/googletest/.gitignore.rej: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE.rej [deleted file]
Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/third_party/googletest/.gitignore.rej [deleted file]

index 2edfa2a..13bfa74 100644 (file)
@@ -1,5 +1,15 @@
 2018-10-17  Youenn Fablet  <youenn@apple.com>
 
+        Remove unneeded .rej files from libwebrtc
+        https://bugs.webkit.org/show_bug.cgi?id=190670
+
+        Reviewed by Mark Lam.
+
+        * Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE.rej: Removed.
+        * Source/third_party/boringssl/src/third_party/googletest/.gitignore.rej: Removed.
+
+2018-10-17  Youenn Fablet  <youenn@apple.com>
+
         REGRESSION (r237075): webrtc/video-replace-muted-track.html is Crashing
         https://bugs.webkit.org/show_bug.cgi?id=190646
 
diff --git a/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE.rej b/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE.rej
deleted file mode 100644 (file)
index 54a8382..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE b/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/.github/PULL_REQUEST_TEMPLATE (rejected hunks)
-@@ -0,0 +1,7 @@
-+Please do not send pull requests to the BoringSSL repository.
-+
-+We do, however, take contributions gladly.
-+
-+See https://boringssl.googlesource.com/boringssl/+/master/CONTRIBUTING.md
-+
-+Thanks!
diff --git a/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/third_party/googletest/.gitignore.rej b/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/third_party/googletest/.gitignore.rej
deleted file mode 100644 (file)
index 499ab90..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-diff a/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/third_party/googletest/.gitignore b/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/third_party/googletest/.gitignore (rejected hunks)
-@@ -0,0 +1,2 @@
-+# python
-+*.pyc