From 241859d69c564509f3cb79ad08ab115dbf01905d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 11 11月 2015 23:14:09 +0800
Subject: [PATCH] Merge branch 'master' of github.com:j123b567/scpi-parser

---
 .gitignore |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab6d275..f57d93d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+# VIM/KDevelop Files
+*.swp
+*.kdev4
+.kdev4/
+*.kate-swp
+
 # Object files
 *.o
 
@@ -16,9 +22,12 @@
 *.out
 *.app
 *.test
+examples/*/test
 
 # Backup files
 *~
 /libscpi/obj/
 /libscpi/dist/
 
+/nbproject/
+*.bak

--
Gitblit v1.9.1