Tim Newsome 1c6d52cd88 Merge branch 'master' into from_upstream ... Conflicts: README contrib/loaders/flash/fespi/Makefile src/flash/nor/fespi.c src/flash/nor/spi.c Change-Id: I78a4e73685cc95daace95e9d16066a6fb51034fb		2019-02-08 14:39:47 -08:00
..
manual	doc: fix several typos within manual documents	2018-05-09 11:43:23 +01:00
Makefile.am	Convert to non-recursive make	2016-12-08 16:23:10 +00:00
fdl.texi	- update openocd.texi to fdl 1.2	2008-02-29 18:10:46 +00:00
openocd.1	docs: update incorrect urls	2013-03-28 23:24:40 +00:00
openocd.texi	Merge branch 'master' into from_upstream	2019-02-08 14:39:47 -08:00