ignoring *.orig files from mercurial merges

This commit is contained in:
fysx
2015-01-16 12:30:43 +01:00
parent 29a3e4b566
commit f46115e794
+1
View File
@@ -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