From c3650df13dea6ea27ee2c8016597e229fbdaf122 Mon Sep 17 00:00:00 2001
From: psychocrypt <psychocrypt@users.noreply.github.com>
Date: Wed, 19 Apr 2017 21:40:16 +0200
Subject: [PATCH] extend `.gitignore`

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

diff --git a/.gitignore b/.gitignore
index 8356f53..60a43db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,12 @@ obj/
 xmr-stak-cpu.layout
 xmr-stak-cpu.depend
 config-debug.txt
+
+# netbeans project files
+/nbproject/
+
+# tmp files
+*~
+
+# merge original backup files
+*.orig