From 71404eef293f1c93ba081a458120b45e5a48f566 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Aug 2012 18:32:51 +0100
Subject: [PATCH] .gitignore: Add *~, *.orig, *.rej, move to root directory

Move the .gitignore out of the Marlin subdirectory so it applies to
the whole tree, and add some missing patterns.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 .gitignore        | 5 +++++
 Marlin/.gitignore | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 Marlin/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0a12acf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.o
+applet/
+*~
+*.orig
+*.rej
diff --git a/Marlin/.gitignore b/Marlin/.gitignore
deleted file mode 100644
index 37a3c9b..0000000
--- a/Marlin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-applet/