Tim Newsome cc0ecfb6d5 Merge branch 'master' into from_upstream ... Conflicts: doc/openocd.texi src/flash/nor/fespi.c Change-Id: Iaac61cb6ab8bba9df1d4b9a52671a09163eb50b2		2021-12-28 10:45:40 -08: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-12-28 10:45:40 -08:00