Conflicts:

	ip_cores/etherbone-core
	ip_cores/general-cores
	ip_cores/gn4124-core
	modules/wrc_core/wrcore_pkg.vhd
	modules/wrc_core/xwr_core.vhd
	syn/spec_1_1/wr_core_demo/Manifest.py
	syn/spec_1_1/wr_core_demo/spec_top_wrc.xise