Merge branch 'tmaster' into future

[fw/stlink] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1bcee081b1499a2190b489414483890c37f1dcb2..c23c60a36dfb48acea330814c28e2e7d7daf2c03 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 /nbproject/private/
 *.o
+*.elf
+doc/tutorial/*.log
+doc/tutorial/*.aux
 libstlink.a
 test_usb
 test_sg