Tim Newsome 5edbbb4827 Merge branch 'master' into from_upstream ... Conflicts: src/flash/nor/nrf5.c src/flash/nor/xcf.c src/jtag/drivers/remote_bitbang.c src/rtos/FreeRTOS.c src/rtos/zephyr.c src/target/cortex_a.c src/target/cortex_a.h src/target/cortex_m.c src/target/riscv/riscv.c Change-Id: I80b0a33b40c06c229d20fe34e04d6322da83326d		2021-06-30 14:56:44 -07:00
..
manual	From upstream (#620)	2021-06-11 13:01:55 -07:00
.gitattributes	doc: fix texinfo files attributes on Windows	2020-03-24 17:20:19 +00:00
Makefile.am	Convert to non-recursive make	2016-12-08 16:23:10 +00:00
fdl.texi	LICENSES: add the GFDL-1.2 license	2021-04-11 20:52:14 +01:00
openocd.1	docs: update incorrect urls	2013-03-28 23:24:40 +00:00
openocd.texi	Merge branch 'master' into from_upstream	2021-06-30 14:56:44 -07:00