Merge branch 'master' into 03-27-refactor_padding_in_runcircuits_and_…

…not_before
AztecProtocol · Apr 3, 2024 · 3e01a45 · 3e01a45
2 parents 8bede91 + 02524e1
commit 3e01a45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 399ce4ebeec578668b40789f34f1faa30f0fc207
-	parent = 2a217de4da2031a9f3913a657a4b39201f4483bf
+	commit = fa97fa7db8f8db5b7c2ab18028441a349df1aa61
+	parent = 75f2cc636a9cc8a2aae9b686e35d61c27130e277
 	method = merge
 	cmdver = 0.4.6
diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/aztec-nr
 	branch = master
-	commit = ec85eb63403bcd96938716d4fef126e6e7e1c6b4
+	commit = 4f1dca416e3e3cea4406dae1174d9bd7d38392b3
 	method = merge
 	cmdver = 0.4.6
-	parent = d5bf200663c9bb72806bd93902bf9e10e933aa36
+	parent = 48e82e68cea4c92cb5e23f59106c3313d5671604