Subrepo Updates (#1368)

mirror/mm

mirror of https://github.com/zeldaret/mm.git synced 2026-08-19 13:24:02 -04:00

* git subrepo pull --force tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "fed1e3ddb"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "fed1e3ddb"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "4ed847317"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ"
  branch:   "main"
  commit:   "4ed847317"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "7f398831f"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "7f398831f"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull (merge) --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "8ce048376"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "8ce048376"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

This commit is contained in:

Derek Hensley

2023-09-08 03:17:54 -07:00

committed by

GitHub

parent 4fa13e4132

commit c8304925da

24 changed files with 905 additions and 88 deletions

tools/asm-processor/.gitrepo

+3 -3

View File

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:simonlindholm/asm-processor.git
 	branch = main
 	commit = bbd86ea1faf84e6a7a0e101ab8068a00a3dfb2fc
 	parent = 8985197b6da23db874ac6e8a29ddec5636944bba
 	commit = fed1e3ddb9967bd427f4599b1b8ededa296bd9f9
 	parent = 4fa13e4132cf8adb2f07bb34927e62e525c8cc79
 	method = merge
 	cmdver = 0.4.3
 	cmdver = 0.4.6