From: Ian Jackson Date: Wed, 8 Aug 2012 17:31:48 +0000 (+0100) Subject: pop X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=159dd894ded940123a60d9be2ce0a8cbc23bccfa;p=marlin.git pop --- diff --git a/meta b/meta index 39ecff0..1ec5555 100644 --- a/meta +++ b/meta @@ -1,13 +1,13 @@ Version: 1 -Previous: 215d6cc2f6c43fde5e9c4df79498327c72829887 -Head: 538189cc19182f28209912efd353081f18aa76e7 +Previous: 442c564d383997f0bdb943fdc7befac8aca9507d +Head: ed5d519a9d476ee627f959b4c116f415b23bf153 Applied: + marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133 + makefile-support-v-1: a546c894dc9079e57c928c9630409b34d9ea1a84 + m206-always-use-homing-homeing: 3cd91cb5c692cfe6a35a40f2bb40174cd8088977 + eeprom-provide-smaller-code-fo: 7a1844e866df485839e1e91436b63590a548a907 + m206-save-values-in-eeprom: d7399516ec458632baae2f7e610345ad856e3f43 + homeaxis-function: ed5d519a9d476ee627f959b4c116f415b23bf153 Unapplied: - marlin-pde-include-comment-for: a3514f7d682a6a223f2a575320d8961454a5a283 - makefile-support-v-1: 29382a47102b3507e1e3c077280b65de11b30b95 - m206-always-use-homing-homeing: 8cd6471ee9f073ce9d19530378897b1119fe81c4 - eeprom-provide-smaller-code-fo: 85314a21d1ae69b77c6f0ec606b9a178816c46d8 - m206-save-values-in-eeprom: 08adf5f78117d343e4eb530a1689f8769fccf561 - homeaxis-function: d80fe23d733598d6aada5546ee80295d6958677f Hidden: enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 0936f72..a81cb26 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: b63e1830d7bfa99d7e1b7bf9cd6aabff6bc19646 -Top: 5672d65c0971062243af61d97f183861a13794dc +Bottom: b5069f0e7634f4a689b665b3bb196be5cefac23e +Top: 2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3 Author: Ian Jackson Date: 2012-08-04 16:13:25 +0100 diff --git a/patches/homeaxis-function b/patches/homeaxis-function index 30a15f6..dbc52ac 100644 --- a/patches/homeaxis-function +++ b/patches/homeaxis-function @@ -1,5 +1,5 @@ -Bottom: ffe11a8d2887176ceac196c769ae6a84b2f279c3 -Top: ffe11a8d2887176ceac196c769ae6a84b2f279c3 +Bottom: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5 +Top: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5 Author: Ian Jackson Date: 2012-08-08 18:30:34 +0100 diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing index 44d6ee8..ca410b6 100644 --- a/patches/m206-always-use-homing-homeing +++ b/patches/m206-always-use-homing-homeing @@ -1,5 +1,5 @@ -Bottom: caf3bde1f429359b50d48a857bebab2dc6615ed9 -Top: b63e1830d7bfa99d7e1b7bf9cd6aabff6bc19646 +Bottom: a7ceab8ef30dc49cd9931d571fb7ce62ef1fd67d +Top: b5069f0e7634f4a689b665b3bb196be5cefac23e Author: Ian Jackson Date: 2012-08-01 21:12:14 +0100 diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom index 7e9c50c..20597fd 100644 --- a/patches/m206-save-values-in-eeprom +++ b/patches/m206-save-values-in-eeprom @@ -1,5 +1,5 @@ -Bottom: 5672d65c0971062243af61d97f183861a13794dc -Top: ffe11a8d2887176ceac196c769ae6a84b2f279c3 +Bottom: 2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3 +Top: 8e7c9dfe8f9c1b267a41ef831eba608dc172e6a5 Author: Ian Jackson Date: 2012-08-01 21:18:08 +0100 diff --git a/patches/makefile-support-v-1 b/patches/makefile-support-v-1 index f617ca6..ad38514 100644 --- a/patches/makefile-support-v-1 +++ b/patches/makefile-support-v-1 @@ -1,5 +1,5 @@ -Bottom: d880bdbb38fe403e9c5c14329f8c597f7aa61915 -Top: caf3bde1f429359b50d48a857bebab2dc6615ed9 +Bottom: ea0dec1cbcd304d9d1750032f70194ceeb751dd6 +Top: a7ceab8ef30dc49cd9931d571fb7ce62ef1fd67d Author: Ian Jackson Date: 2012-08-01 21:31:38 +0100 diff --git a/patches/marlin-pde-include-comment-for b/patches/marlin-pde-include-comment-for index 9520ab3..7373999 100644 --- a/patches/marlin-pde-include-comment-for +++ b/patches/marlin-pde-include-comment-for @@ -1,5 +1,5 @@ -Bottom: f1ffc5304dbad10f158614da132103ce0a1370ea -Top: d880bdbb38fe403e9c5c14329f8c597f7aa61915 +Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b +Top: ea0dec1cbcd304d9d1750032f70194ceeb751dd6 Author: Ian Jackson Date: 2012-08-08 17:56:39 +0100