pop

diff --git a/meta b/meta
index f4b328ce4033a283d7a3ba0316665164b96ac996..53faa1c2b7eb919c310835cea7e9a6adb2584137 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: faea6bd574437ac3e587fc95febe98343faa35a7
-Head: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757
+Previous: a473c2fd5b7f437ed1480734896ad07d359190fe
+Head: 050a31d9f4979748f005c1a38eeb9a204881c483
 Applied:
   marlin-pde-include-comment-for: a873541ef6b23100dc6dec15e6195e87cef6fce5
   add-to-marlin-gitignore: 71404eef293f1c93ba081a458120b45e5a48f566
@@ -8,9 +8,9 @@ Applied:
   makefile-avr-size: 3f15b7c7b863abfa2c6cb157a7f220ab9627d776
   motion-control-max-min: faccb358508d49d0bef35dc0521043f04508bcc3
   m206-always-use-homing-homeing: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757
+  eeprom-provide-smaller-code-fo: a31f275d62753d55119658c98c39b59bc5efa8b2
+  homeaxis-function: e83a4b447cd8a74d230e57bef4355d91d6b899fe
+  m206-save-values-in-eeprom: 050a31d9f4979748f005c1a38eeb9a204881c483
 Unapplied:
-  eeprom-provide-smaller-code-fo: d351b9f64286d75dd4ebd4b09ed00ef31008364b
-  homeaxis-function: 7ff6b3c2e6523f2ac8b030dde0fac52595257339
-  m206-save-values-in-eeprom: 5e01a34f57ba24e6685e40688b2649150e25be43
 Hidden:
   enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa

diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 1ccdc7bed107e4f1a2fb3a8ee9d8edce474ac17b..77bb2e791ac95b28df6e964b1c1a48220c4a4ed8 100644 (file)
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: a47c445c515e8480838e04500acc170cc895298e
-Top:    e8f1ac68845d759fcca286c4e4aa55a20a35f4b2
+Bottom: eaaf908848a4a0cd0e69f559ed75c700974fc20f
+Top:    069dc0bcdbc203bf8d7412c0bf24b4c426068088
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-04 16:13:25 +0100
 
@@ -36,7 +36,7 @@ index b465d85..208ac33 100644
  
  //things to write to serial from Programmemory. saves 400 to 2k of RAM.
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index b358400..0355f93 100644
+index c153298..bb7c6f2 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -203,6 +203,13 @@ bool Stopped=false;

diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index 662b0118800b64c6175209f03c5b860fd88300b4..0b9d141f0819795e3f63eb574d7cee83a86b9fc8 100644 (file)
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: e8f1ac68845d759fcca286c4e4aa55a20a35f4b2
-Top:    1e45527396d18a734fba0181fbbfbf3709b52c95
+Bottom: 069dc0bcdbc203bf8d7412c0bf24b4c426068088
+Top:    3ab4763ae3deebf76bc615f517ca3bef62175fed
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -18,7 +18,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 0355f93..fdb1b98 100644
+index bb7c6f2..4f876c2 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -557,6 +557,7 @@ bool code_seen(char code)

diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom
index b068979ba63ee68d6647358ec95d0c6292d863fc..3b23f1bb15e928dbcbc6edce8e7cd1b1355ab259 100644 (file)
--- a/patches/m206-save-values-in-eeprom
+++ b/patches/m206-save-values-in-eeprom
@@ -1,5 +1,5 @@
-Bottom: 1e45527396d18a734fba0181fbbfbf3709b52c95
-Top:    742b5660b5324fd909a5fb552158d585c216b3c1
+Bottom: 3ab4763ae3deebf76bc615f517ca3bef62175fed
+Top:    f67f47d59b872b4a645e13abb30a1062b014ab83
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:18:08 +0100