Merge branch 'master' into mingw

[fw/stlink] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8e974b74bbd575209f80cbb05750e867e9343bea..0a705b55b3d6da4357bd9e6f73a2d6e27fe1bb06 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,29 @@
-/nbproject/private/
+COPYING
+INSTALL
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.guess
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+missing
+*.bz2
+*.lo
 *.o
-*.elf
-doc/tutorial/*.log
-doc/tutorial/*.aux
-libstlink.a
-test_usb
-test_sg
-gdbserver/st-util
-flash/flash
-*.log
-example/*/*.bin
-example/*/*.elf
-example/*/*/*.bin
-example/*/*/*/*.bin
-example/*/*/*.a
-example/*/*/*/*.a
+.libs
+libtool
+*.la
+config.log
+config.status
+compile
+st-flash
+st-util
+*.deps*
+*.dirstamp
+*.a
+Makefile
+*.exe
+example/blink/*.elf