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 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdb9024..74a71f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /libscpi/obj/
 /libscpi/dist/
 
+/nbproject/
\ No newline at end of file

--
Gitblit v1.9.1