From 66215bff25b8961e396ea4a3b1847ac668de3ff4 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 22 Dec 2013 22:04:41 +0100
Subject: Solved compile problems due to latest merge

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index f8f940470..7d21ae36a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ GRTAGS
 GTAGS
 TAGS
 cscope*
+*~
-- 
cgit v1.2.3