From: Ian Jackson Date: Wed, 8 Aug 2012 17:33:06 +0000 (+0100) Subject: refresh (create temporary patch) X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f63e6a321ba1b53521da9a6ee37acf91188adae3;p=marlin.git refresh (create temporary patch) --- diff --git a/meta b/meta index db368cc..39bdb99 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: d6fe48d441f10f058cc9ae3236c1a157f8910abf -Head: 347affb0c3a653e260b3e740c41300bcf25ff9ec +Previous: 2a3c01994c217fe756b35dbfdd5c2a3228018e97 +Head: 123e4874716eec31866078e9e4980df901841db4 Applied: marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133 makefile-support-v-1: a546c894dc9079e57c928c9630409b34d9ea1a84 @@ -9,6 +9,7 @@ Applied: m206-save-values-in-eeprom: d7399516ec458632baae2f7e610345ad856e3f43 homeaxis-function: ed5d519a9d476ee627f959b4c116f415b23bf153 add-to-marlin-gitignore: 347affb0c3a653e260b3e740c41300bcf25ff9ec + refresh-temp: 123e4874716eec31866078e9e4980df901841db4 Unapplied: Hidden: enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..61d44f6 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,17 @@ +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/ ++*~