Merge remote-tracking branch 'origin/openframe_tapeout' into openframe_tapeout

# Conflicts:
#	manifest
This commit is contained in:
jeffdi 2023-06-09 10:05:21 -07:00
commit f2e4bc5512
1 changed files with 2 additions and 2 deletions

View File

@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524 verilog/rtl/mprj_io_buffer.v
b9d6114a5067a04dd59cdd46fb988591c16743ce verilog/rtl/spare_logic_block.v b9d6114a5067a04dd59cdd46fb988591c16743ce verilog/rtl/spare_logic_block.v
8f0bec01c914efe790a09ffe62bbfe0781069e35 verilog/rtl/xres_buf.v 8f0bec01c914efe790a09ffe62bbfe0781069e35 verilog/rtl/xres_buf.v
256190717faa72005cf7656d8443c4c0693b3f78 scripts/set_user_id.py 256190717faa72005cf7656d8443c4c0693b3f78 scripts/set_user_id.py
548bcf2c67867cd6bb0107352409710d64ee1350 scripts/generate_fill.py 98168b1fb6f80b196f9a05e725ec6ad99bc57ac6 scripts/generate_fill.py
844f897f586a5cdcf95be3dbfdd04201c9ed14ca scripts/compositor.py 9e31b1bbbb03024d02d54f9da8d42b3837abc5e5 scripts/compositor.py