chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83dcad5)
Refresh of add-to-marlin-gitignore
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:01:27 +0000 (19:01 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 9 Aug 2012 18:01:27 +0000 (19:01 +0100)
.gitignore [moved from Marlin/.gitignore with 53% similarity] patch | blob | history

diff --git a/Marlin/.gitignore b/.gitignore
similarity index 53%
rename from Marlin/.gitignore
rename to .gitignore
index 4f6f90695552d13260ab4efb388d8de03301422f..0a12acfd7cf9aa712d2982af008920b55873bb4f 100644 (file)
--- a/Marlin/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.o
 applet/
 *~
+*.orig
+*.rej
Unnamed repository; edit this file 'description' to name the repository.