Tim Newsome e07613de33 Merge branch 'master' into from_upstream ...

Conflicts:
      .gitmodules
      .travis.yml
      jimtcl
      src/jtag/core.c
      src/jtag/drivers/ftdi.c
      src/jtag/drivers/libjaylink
      src/jtag/drivers/mpsse.c
      src/jtag/drivers/stlink_usb.c
      src/rtos/hwthread.c
      src/target/riscv/riscv-013.c
      src/target/riscv/riscv.c
      tcl/board/sifive-hifive1-revb.cfg

Change-Id: I2d26ebeffb4c1374730d2e20e6e2a7710403657c

2020-06-23 13:05:43 -07:00

..

manual

doc: fix typo and spelling

2020-05-09 14:37:25 +01:00

.gitattributes

doc: fix texinfo files attributes on Windows

2020-03-24 17:20:19 +00:00

fdl.texi

coding style: doc: remove empty lines at end of text files

2020-02-24 10:31:29 +00:00

Makefile.am

Convert to non-recursive make

2016-12-08 16:23:10 +00:00

openocd.1

docs: update incorrect urls

2013-03-28 23:24:40 +00:00

openocd.texi

Merge branch 'master' into from_upstream

2020-06-23 13:05:43 -07:00