From 19c9a0443b17176a27329b69ee16fe28d7be6fd8 Mon Sep 17 00:00:00 2001
From: ShadowNinja <noreply@gmail.com>
Date: Mon, 08 Jul 2013 22:57:56 +0200
Subject: [PATCH] Merge branch 'indev'

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

diff --git a/.gitignore b/.gitignore
index 5ebd21a..716917d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,7 @@
 
 # Mac crap
 .DS_Store
+
+#gedit backup files
+*~
+

--
Gitblit v1.8.0