Tim Newsome 927c4db298 Merge branch 'master' into from_upstream ... I may have broken memory sampling with this merge. Conflicts: doc/openocd.texi src/helper/command.c src/jtag/drivers/ftdi.c src/rtos/FreeRTOS.c Change-Id: I2b7e09b2d3b244db546c5212532e6b48fb66dca4		2021-05-03 11:04:15 -07:00
..
manual	doc/manual/style: Fix comments	2021-04-11 21:27:40 +01: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-05-03 11:04:15 -07:00