Merge remote-tracking branch 'upstream/master'

[fw/stlink] / .gitignore

diff --git a/.gitignore b/.gitignore
index d1d6410ff4ac0bd543e5ebf1166e9e14c029b53f..6ed8efce9d2c60f9eb6ff5d6c286c3674ab90227 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-COPYING
 INSTALL
 Makefile.in
 aclocal.m4
@@ -21,8 +20,11 @@ config.status
 compile
 st-flash
 st-util
+test_usb
+test_sg
 *.deps*
 *.dirstamp
 *.a
 Makefile
 *.exe
+example/blink/*.elf