From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 18:04:50 +0000 (+0100)
Subject: pop
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3a3dac6738928f832b057509ccd3dbc2796e9036;p=marlin.git

pop
---

diff --git a/meta b/meta
index b957ca8..2ae1f2d 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 390ac16e39b5a895976dd0eca74ecff4f29af69d
-Head: b5a83e7c60fcd37ea70396d521924b6c62555feb
+Previous: 126ae1c3e97559a426db898c213985bb0f5e380a
+Head: 734e4f2645cecfee83e7ac0cb12ffe2a393f5f91
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
@@ -8,8 +8,8 @@ Applied:
   makefile-avr-size: e7ca49239c134da3660d80b1005a9564672d6c6b
   motion-control-max-min: 91d59adf663163ca1d6a8795fc22cfc5c9902dfe
   m206-always-use-homing-homeing: b5a83e7c60fcd37ea70396d521924b6c62555feb
+  eeprom-provide-smaller-code-fo: 734e4f2645cecfee83e7ac0cb12ffe2a393f5f91
 Unapplied:
-  eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
   m206-save-values-in-eeprom: bbde4ea454248ef02e59183cab6992c5d4331d8c
   homeaxis-function: 48f1b27f67cb5a1b59e72d4ab9c5bfe05c88870d
   enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 1355bd2..3d434f3 100644
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: 8b41053f51ee51e0877345a8761e69d6bef34c39
-Top:    a1b9333f4fba2ff334edb9f004c26c404c06a7f6
+Bottom: c2feea4afd56caea863e82cd486423f93f510614
+Top:    5fef2109692f8670c2a81bbe08b6d303f46832ff
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-04 16:13:25 +0100
 
@@ -19,7 +19,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
-index c8115af..a78d2ee 100644
+index b465d85..8e833d1 100644
 --- a/Marlin/Marlin.h
 +++ b/Marlin/Marlin.h
 @@ -84,7 +84,11 @@ const char echomagic[] PROGMEM ="echo:";
@@ -36,10 +36,10 @@ index c8115af..a78d2ee 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 4abd98b..5af15f0 100644
+index be91124..9bcbf21 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -202,6 +202,13 @@ bool Stopped=false;
+@@ -203,6 +203,13 @@ bool Stopped=false;
  
  void get_arc_coordinates();