From: Michael Pratt <michael@pratt.im>
Date: Sun, 8 Jul 2012 19:52:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=f8d3b170f974d7070a83fd6090ca5fe80aaa3420;hp=bbd45a33fc8e47c4c0a2c73bcbadda432b5979fa;p=fw%2Fstlink

Merge remote-tracking branch 'upstream/master'
---

diff --git a/.gitignore b/.gitignore
index cf2f1a4..6ed8efc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ config.status
 compile
 st-flash
 st-util
+test_usb
+test_sg
 *.deps*
 *.dirstamp
 *.a