From e39eab69898948655f2659be88ddf9a279f5f70d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 8 Aug 2012 18:33:06 +0100 Subject: [PATCH] refresh --- meta | 7 +++---- patches/add-to-marlin-gitignore | 11 +++++++++-- patches/refresh-temp | 17 ----------------- 3 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 39bdb99..6144f6e 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 2a3c01994c217fe756b35dbfdd5c2a3228018e97 -Head: 123e4874716eec31866078e9e4980df901841db4 +Previous: 0c440f25504f125bc2b566a7592c01614c4b0f2e +Head: 6fa8cc5b58fc2b674ea925f00550aca95110c67c Applied: marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133 makefile-support-v-1: a546c894dc9079e57c928c9630409b34d9ea1a84 @@ -8,8 +8,7 @@ Applied: eeprom-provide-smaller-code-fo: 7a1844e866df485839e1e91436b63590a548a907 m206-save-values-in-eeprom: d7399516ec458632baae2f7e610345ad856e3f43 homeaxis-function: ed5d519a9d476ee627f959b4c116f415b23bf153 - add-to-marlin-gitignore: 347affb0c3a653e260b3e740c41300bcf25ff9ec - refresh-temp: 123e4874716eec31866078e9e4980df901841db4 + add-to-marlin-gitignore: 6fa8cc5b58fc2b674ea925f00550aca95110c67c Unapplied: Hidden: enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c diff --git a/patches/add-to-marlin-gitignore b/patches/add-to-marlin-gitignore index d52c4e7..12f9cd7 100644 --- a/patches/add-to-marlin-gitignore +++ b/patches/add-to-marlin-gitignore @@ -1,5 +1,5 @@ Bottom: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5 -Top: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5 +Top: 65b65493818ae0e7effd88b9cd1b596276f15041 Author: Ian Jackson Date: 2012-08-08 18:32:51 +0100 @@ -10,4 +10,11 @@ Signed-off-by: Ian Jackson --- - +diff --git a/Marlin/.gitignore b/Marlin/.gitignore +index 37a3c9b..4f6f906 100644 +--- a/Marlin/.gitignore ++++ b/Marlin/.gitignore +@@ -1,2 +1,3 @@ + *.o + applet/ ++*~ diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 61d44f6..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,17 +0,0 @@ -Bottom: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5 -Top: 65b65493818ae0e7effd88b9cd1b596276f15041 -Author: Ian Jackson -Date: 2012-08-08 18:33:05 +0100 - -Refresh of add-to-marlin-gitignore - ---- - -diff --git a/Marlin/.gitignore b/Marlin/.gitignore -index 37a3c9b..4f6f906 100644 ---- a/Marlin/.gitignore -+++ b/Marlin/.gitignore -@@ -1,2 +1,3 @@ - *.o - applet/ -+*~ -- 2.30.2