From 21cc8af683c5e60503e8047dffb533612e56f228 Mon Sep 17 00:00:00 2001
From: Helge Weissig <helgew@grajagan.org>
Date: Fri, 16 Jan 2015 16:28:30 -0800
Subject: [PATCH] added temp files from mergetool

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

diff --git a/.gitignore b/.gitignore
index 56a9b2c9..55821f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@ build/
 .cproject
 .settings
 .project
+
+*.orig