From 4dab62dfcfbb57b0065efafd57ccfab2cbb3c0ac Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 9 May 2017 13:26:23 -0700 Subject: [PATCH] Move brightray submodules to root vendor --- .gitmodules | 6 ++++++ brightray/.gitmodules | 6 ------ brightray/vendor/.gitignore | 1 - {brightray/vendor => vendor}/gyp | 0 {brightray/vendor => vendor}/libchromiumcontent | 0 5 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 brightray/.gitmodules delete mode 100644 brightray/vendor/.gitignore rename {brightray/vendor => vendor}/gyp (100%) rename {brightray/vendor => vendor}/libchromiumcontent (100%) diff --git a/.gitmodules b/.gitmodules index 9ae1e8306bc2..73b12931d77f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,9 @@ [submodule "vendor/pdf_viewer"] path = vendor/pdf_viewer url = https://github.com/electron/pdf-viewer.git +[submodule "vendor/gyp"] + path = vendor/gyp + url = https://github.com/electron/gyp +[submodule "vendor/libchromiumcontent"] + path = vendor/libchromiumcontent + url = https://github.com/electron/libchromiumcontent diff --git a/brightray/.gitmodules b/brightray/.gitmodules deleted file mode 100644 index 54ed18cf53ba..000000000000 --- a/brightray/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "vendor/libchromiumcontent"] - path = vendor/libchromiumcontent - url = https://github.com/electron/libchromiumcontent -[submodule "vendor/gyp"] - path = vendor/gyp - url = https://github.com/electron/gyp diff --git a/brightray/vendor/.gitignore b/brightray/vendor/.gitignore deleted file mode 100644 index 0920e14cbc0f..000000000000 --- a/brightray/vendor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/download/ diff --git a/brightray/vendor/gyp b/vendor/gyp similarity index 100% rename from brightray/vendor/gyp rename to vendor/gyp diff --git a/brightray/vendor/libchromiumcontent b/vendor/libchromiumcontent similarity index 100% rename from brightray/vendor/libchromiumcontent rename to vendor/libchromiumcontent