From eca63adb1f12830b16271ac823088dea505c4818 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2012 17:32:57 +0100 Subject: [PATCH] pop --- meta | 6 +++--- patches/eeprom-provide-smaller-code-fo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta b/meta index 5c39ec8..9a1e87a 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: ea8884e649ddace3f32e7150cd6b01f5cd5384a3 -Head: 8daa65176ac195afeaad4a06c00a97dfff5951fe +Previous: 5f3196769f30fabadbd546e40fd52815a79520a4 +Head: dcb84ce5f56d58178c15475b0611e12bfa121805 Applied: marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e @@ -9,8 +9,8 @@ Applied: motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f m206-always-use-homing-homeing: ef16d2c9bd8d55b96310ef873aad725f7974f968 enable-eeprom-settings: 8daa65176ac195afeaad4a06c00a97dfff5951fe + eeprom-provide-smaller-code-fo: dcb84ce5f56d58178c15475b0611e12bfa121805 Unapplied: - eeprom-provide-smaller-code-fo: 0fbea35eb16f424788f2eb30d8a49dd3808f7a73 homeaxis-function: 566437da4b8a0825c7d7b4152fc5245725e67860 m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493 Hidden: diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 676421e..22c3473 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: 09f87248b08ff82f7ea8817de9aae4b47351034c -Top: 36e31553d776fe0068394d49b207ca63596f8dbb +Bottom: 0de6bcfbded554c7e0f24cb559085d479490f841 +Top: d71f3b37e4db1c3205d924c9ac6d7db9c438baa6 Author: Ian Jackson 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 5b00f9c..a854714 100644 +index a772fa6..54441ea 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -203,6 +203,13 @@ bool Stopped=false; -- 2.30.2