Merge remote-tracking branch 'upstream/master'

[fw/stlink] / .gitignore

diff --git a/.gitignore b/.gitignore
index afd4b0e23cdf8b3d7af80315b52fd92b1bf9ffb5..6ed8efce9d2c60f9eb6ff5d6c286c3674ab90227 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,30 @@
-/nbproject/private/
+INSTALL
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.guess
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+missing
+*.bz2
+*.lo
 *.o
+.libs
+libtool
+*.la
+config.log
+config.status
+compile
+st-flash
+st-util
+test_usb
+test_sg
+*.deps*
+*.dirstamp
+*.a
+Makefile
+*.exe
+example/blink/*.elf