From 322f3de410d200e8dd47eb0595b8cb8575c4e62b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 24 6月 2015 22:17:10 +0800
Subject: [PATCH] Merge branch 'master' into experimental

---
 .gitignore |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d2ca1ec..74a71f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,12 @@
 *.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/
+
+/nbproject/
\ No newline at end of file

--
Gitblit v1.9.1