From 96f23737e877fa29efa1f1d9b03131fbc4ee1667 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:54:50 +0800
Subject: [PATCH] Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73

---
 .gitignore |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74a71f5..ab2dd72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+# VIM/KDevelop Files
+*.swp
+*.kdev4
+.kdev4/
+*.kate-swp
+
 # Object files
 *.o
 
@@ -23,4 +29,10 @@
 /libscpi/obj/
 /libscpi/dist/
 
-/nbproject/
\ No newline at end of file
+/nbproject/
+*.bak
+
+# Code coverage files
+*.gcno
+*.gcda
+*.gcov

--
Gitblit v1.9.1