From 2ff9562bacfe192da450fd82727406bcd48200f5 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 19 Jun 2020 12:16:02 +0200 Subject: [PATCH] =?UTF-8?q?Add=20=E2=80=9Cmerge=E2=80=9D=20and=20=E2=80=9C?= =?UTF-8?q?upstream=E2=80=9D=20entries=20for=20submodules.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cb2ff985..6cbe89b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,33 @@ [submodule "pegtl"] path = include/lol/3rdparty/pegtl - url = ../../lolengine/ext-pegtl.git + url = https://github.com/lolengine/ext-pegtl branch = lol + update = merge + upstream = https://github.com/taocpp/PEGTL + [submodule "mingw-std-threads"] path = include/lol/3rdparty/mingw-std-threads - url = ../../lolengine/ext-mingw-std-threads.git + url = https://github.com/lolengine/ext-mingw-std-threads branch = master + update = merge + upstream = https://github.com/meganz/mingw-std-threads + [submodule "step"] path = include/lol/3rdparty/step - url = ../../lolengine/ext-step + url = https://github.com/lolengine/ext-step + branch = lol + update = merge + upstream = https://github.com/storm-ptr/step + [submodule "portable-file-dialogs"] path = include/lol/3rdparty/portable-file-dialogs - url = ../../samhocevar/portable-file-dialogs.git + url = https://github.com/samhocevar/portable-file-dialogs branch = master + update = merge + [submodule "cli11"] path = include/lol/3rdparty/cli11 - url = ../../lolengine/ext-cli11.git + url = https://github.com/lolengine/ext-cli11 + branch = lol + update = merge + upstream = https://github.com/CLIUtils/CLI11