da44fb5407
Conflicts: doc/openocd.texi src/jtag/aice/aice_pipe.c src/jtag/aice/aice_usb.c src/rtos/FreeRTOS.c src/rtos/hwthread.c src/rtos/rtos_standard_stackings.c src/target/riscv/riscv.c Change-Id: I0c6228c499d60274325be895fbcd8007ed1699bc |
||
---|---|---|
.. | ||
manual | ||
.gitattributes | ||
Makefile.am | ||
checkpatch.rst | ||
fdl.texi | ||
openocd.1 | ||
openocd.texi |