diff --git a/.mergetest b/.mergetest new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/nanosoc_tech b/nanosoc_tech index 4a29fd4d7d6349c973b8dab7e89b069883fff2ff..d8cd630b7f280dd8c2ff6bace8e5ec053ebad97f 160000 --- a/nanosoc_tech +++ b/nanosoc_tech @@ -1 +1 @@ -Subproject commit 4a29fd4d7d6349c973b8dab7e89b069883fff2ff +Subproject commit d8cd630b7f280dd8c2ff6bace8e5ec053ebad97f diff --git a/projbranch b/projbranch index c324fd1a322c7fbcb35aacd643adb64b90fdce48..822a736b9428c89bb5d4726f21ee944275d6064b 100644 --- a/projbranch +++ b/projbranch @@ -13,7 +13,7 @@ # Add your Accelerator Repository here secworks-aes: master -nanosoc_tech: feat_nanosoc_regions +nanosoc_tech: main accelerator_wrapper_tech: main fpga_lib_tech: main generic_lib_tech: main