From 6054f2efebb898bbd32ab7388eae7b9ff4357b0a Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 21 10月 2013 03:50:04 +0800
Subject: [PATCH] Merge remote branch 'upstream/master'

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

diff --git a/.gitignore b/.gitignore
index c4d3af6..cdb9024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,11 @@
 *.exe
 *.out
 *.app
+*.test
+examples/*/test
 
 # Backup files
 *~
+/libscpi/obj/
+/libscpi/dist/
+

--
Gitblit v1.9.1