From 173867689a0b328947c12e45a863145ec20c7628 Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 23 3月 2015 20:36:11 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/j123b567/scpi-parser

---
 .gitignore |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d2ca1ec..254e0af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.d
+
 # Object files
 *.o
 
@@ -15,10 +17,11 @@
 *.exe
 *.out
 *.app
+*.test
+examples/*/test
 
 # Backup files
 *~
-/netbeans/nbproject/private/
-/netbeans/build/Debug/
-/netbeans/dist/Debug/
-/netbeans/core
\ No newline at end of file
+/libscpi/obj/
+/libscpi/dist/
+

--
Gitblit v1.9.1