From 2c14cd30ecbacbd5a808cb2641d40f6d568ec294 Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Sat, 27 Apr 2013 21:30:33 +0200
Subject: Added a few file to .gitignore

---
 .gitignore | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 31ebdf1..cb977ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,15 @@ GTAGS
 # files created by Codeblocks
 .objs
 *.layout
+
+# git merge backups
+*.orig
+
+# eclipse files
+.cproject
+.externalToolBuilders
+.project
+.settings
+
+# sqlite dbs
+*.db
-- 
cgit