1 files changed, 12 insertions, 0 deletions

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