From f4d3fcc03f61df6becf302f555b27da7e361eae5 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 21 10月 2013 17:00:47 +0800
Subject: [PATCH] Merge branch 'master' of git://github.com/andrey-nakin/scpi-parser into andrey-nakin-master

---
 .gitignore |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23c209e..cdb9024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,11 @@
 *.exe
 *.out
 *.app
+*.test
+examples/*/test
 
 # Backup files
 *~
-/netbeans/nbproject/private/
-/netbeans/build/Debug/
-/netbeans/dist/Debug/
\ No newline at end of file
+/libscpi/obj/
+/libscpi/dist/
+

--
Gitblit v1.9.1