From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Aug 2012 17:45:24 +0000 (+0100)
Subject: pop
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2484bf95943b344a6fd2e7b3ca8ebf0ef68ce24f;p=marlin.git

pop
---

diff --git a/meta b/meta
index 5ac6d52..aaf462f 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 8c275bec09fad150ac4d85ed88cb3511a91c1a8b
-Head: f024b1406e4c3128a46e96b3356f749757292da6
+Previous: cd5e3762ddd5e89447682cff2ca62fc379840f5a
+Head: c9daa4648a07d878585cf6118df3ecee7ce5fe75
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   makefile-support-v-1: a546c894dc9079e57c928c9630409b34d9ea1a84
@@ -8,7 +8,7 @@ Applied:
   eeprom-provide-smaller-code-fo: 7a1844e866df485839e1e91436b63590a548a907
   m206-save-values-in-eeprom: d7399516ec458632baae2f7e610345ad856e3f43
   homeaxis-function: f024b1406e4c3128a46e96b3356f749757292da6
+  add-to-marlin-gitignore: c9daa4648a07d878585cf6118df3ecee7ce5fe75
 Unapplied:
-  add-to-marlin-gitignore: 6fa8cc5b58fc2b674ea925f00550aca95110c67c
 Hidden:
   enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
diff --git a/patches/add-to-marlin-gitignore b/patches/add-to-marlin-gitignore
index 12f9cd7..404fc45 100644
--- a/patches/add-to-marlin-gitignore
+++ b/patches/add-to-marlin-gitignore
@@ -1,5 +1,5 @@
-Bottom: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5
-Top:    65b65493818ae0e7effd88b9cd1b596276f15041
+Bottom: 451054c63dfecb31617488c7273ffe5e83319126
+Top:    9f97c472025a65792c7e4dbf067f02ef8f535ad4
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:32:51 +0100