From f46115e794c9b86e50ce2f4d0f9721a2cf316c2b Mon Sep 17 00:00:00 2001
From: fysx <martin@fysx.org>
Date: Fri, 16 Jan 2015 12:30:43 +0100
Subject: [PATCH] ignoring *.orig files from mercurial merges

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

diff --git a/.gitignore b/.gitignore
index 268e5870..6809e077 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ local.properties
 *.o
 *.so
 *.a
+*.orig
 
 !jni/LuaJIT-2.0.1/android/armeabi/libluajit.a
 !jni/LuaJIT-2.0.1/android/armeabi-v7a/libluajit.a