From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2012 00:43:00 +0000 (+0100)
Subject: pop
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c32bda3cbe095f79677514db4fb68c825ddc516e;p=marlin.git

pop
---

diff --git a/meta b/meta
index a843157..20974ea 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 282324293f0537f259596e0f64647c1883dd1960
-Head: 957e966d2d5fb1884adb1f982ad01d39d547eb36
+Previous: a9875a15237424ee6f7666ccd0406d71baf59eac
+Head: adee81170d74d3b704d0c4bad7852c0ac8099be1
 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: 957e966d2d5fb1884adb1f982ad01d39d547eb36
+  eeprom-provide-smaller-code-fo: 7bb326d389cd5a9f14a99bf0fa8275712fe4b380
+  homeaxis-function: 1dba212e18fbb80976462387744d400235c9841d
+  m206-save-values-in-eeprom: adee81170d74d3b704d0c4bad7852c0ac8099be1
 Unapplied:
-  eeprom-provide-smaller-code-fo: a31f275d62753d55119658c98c39b59bc5efa8b2
-  homeaxis-function: e83a4b447cd8a74d230e57bef4355d91d6b899fe
-  m206-save-values-in-eeprom: 050a31d9f4979748f005c1a38eeb9a204881c483
 Hidden:
   enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa
diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 77bb2e7..fb9beba 100644
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: eaaf908848a4a0cd0e69f559ed75c700974fc20f
-Top:    069dc0bcdbc203bf8d7412c0bf24b4c426068088
+Bottom: f97dcd498bdb60ba836284b99c292a52ec1a1656
+Top:    eabd991e53590252996a913cdab4f60f5520733c
 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 c153298..bb7c6f2 100644
+index d11b51c..22e3e64 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 0b9d141..bd326e9 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: 069dc0bcdbc203bf8d7412c0bf24b4c426068088
-Top:    3ab4763ae3deebf76bc615f517ca3bef62175fed
+Bottom: eabd991e53590252996a913cdab4f60f5520733c
+Top:    fb7814579aa4bbeb9ff6c02c6ee0f35043a2ba23
 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 bb7c6f2..4f876c2 100644
+index 22e3e64..8ed36a5 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 3b23f1b..2070e5f 100644
--- a/patches/m206-save-values-in-eeprom
+++ b/patches/m206-save-values-in-eeprom
@@ -1,5 +1,5 @@
-Bottom: 3ab4763ae3deebf76bc615f517ca3bef62175fed
-Top:    f67f47d59b872b4a645e13abb30a1062b014ab83
+Bottom: fb7814579aa4bbeb9ff6c02c6ee0f35043a2ba23
+Top:    43873b3597e8a146973d5d776c41f9a5d7ad97bd
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:18:08 +0100