Ivan I. Ovchinnikov 77e2cf25d3 Merge remote-tracking branch 'my/simulation' into simulation preferring their ... # Conflicts: # Top/niosII.sopcinfo # Top/semafor.qws # Top/software/semafor/.settings/language.settings.xml # Top/software/semafor/RUN_ON_HDL_SIMULATOR_ONLY_semafor.elf # Top/software/semafor/RUN_ON_HDL_SIMULATOR_ONLY_semafor.map # Top/software/semafor/RUN_ON_HDL_SIMULATOR_ONLY_semafor.objdump # Top/software/semafor/mem_init/hdl_sim/niosII_mem.dat # Top/software/semafor/mem_init/hdl_sim/niosII_mem.sym # Top/software/semafor/mem_init/niosII_mem.hex # Top/software/semafor/obj/default/runtime/sim/mentor/wave.do # Top/software/semafor/sem.c # Top/software/semafor_bsp/.settings/language.settings.xml # Top/software/semafor_bsp/libhal_bsp.a # Top/software/semafor_bsp/settings.bsp # Top/software/semafor_bsp/summary.html		2023-01-24 15:05:03 +03:00
..
dec	Merge remote-tracking branch 'my/simulation' into simulation preferring their	2023-01-24 15:05:03 +03:00
sigdel	reported lr2 + individual	2023-01-18 16:45:45 +03:00