Merge branch 'tmaster' into future

[fw/stlink] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0a541c78bc18ec24dcbef429eab3dad0f13e0983..c23c60a36dfb48acea330814c28e2e7d7daf2c03 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,8 @@ doc/tutorial/*.aux
 libstlink.a
 test_usb
 test_sg
-gdbserver/st-utils
+gdbserver/st-util
+flash/flash
+*.log
+example/*/*.bin
+example/*/*.elf