From 59d4618036c85dafc9026d0f84ab00fcb900acc9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 23 10月 2013 21:46:41 +0800
Subject: [PATCH] merge functionality from 'master' branch

---
 .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