Conflicts:
	modules/common/Manifest.py
	modules/common/gencores_pkg.vhd
	modules/genrams/Manifest.py
	modules/genrams/altera/generic_dpram.vhd
	modules/genrams/genram_pkg.vhd
	modules/genrams/memory_loader_pkg.vhd
	modules/genrams/xilinx/Manifest.py
	modules/genrams/xilinx/generic_dpram.vhd
	modules/wishbone/Manifest.py
	modules/wishbone/wb_crossbar/Manifest.py
	modules/wishbone/wb_crossbar/xwb_crossbar.vhd
	modules/wishbone/wb_dpram/xwb_dpram.vhd
	modules/wishbone/wb_onewire_master/wb_onewire_master.vhd
	modules/wishbone/wb_slave_adapter/wb_slave_adapter.vhd
	modules/wishbone/wbgen2/wbgen2_fifo_async.vhd
	modules/wishbone/wbgen2/wbgen2_fifo_sync.vhd
	modules/wishbone/wbgen2/wbgen2_pkg.vhd
	modules/wishbone/wishbone_pkg.vhd