From f00178ad3c88c9f03427832bb2d30d2faf957d7e Mon Sep 17 00:00:00 2001 From: Logan McNaughton Date: Wed, 9 Jun 2021 21:05:33 -0600 Subject: [PATCH] update core source --- pull_repos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pull_repos.sh b/pull_repos.sh index cc0996a..50d8f56 100755 --- a/pull_repos.sh +++ b/pull_repos.sh @@ -1,6 +1,6 @@ -git remote add mupen64plus-core https://github.com/mupen64plus/mupen64plus-core.git +git remote add mupen64plus-core https://github.com/loganmc10/mupen64plus-core.git git fetch mupen64plus-core -git merge -s subtree mupen64plus-core/master --allow-unrelated-histories --squash +git merge -s subtree mupen64plus-core/m64p --allow-unrelated-histories --squash git commit -m "update core" git remote add mupen64plus-gui https://github.com/m64p/mupen64plus-gui.git