Merge remote-tracking branch 'upstream/master' into travis-add-autotools-build
[fw/stlink] / flash /
drwxr-xr-x   ..
-rw-r--r-- 445 Makefile
-rw-r--r-- 7175 main.c