From 1677defcd3d05c711bfe5b343247d55738aed645 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 9 Aug 2012 19:20:24 +0100 Subject: [PATCH] pop --- meta | 22 +++++++++++----------- patches/add-to-marlin-gitignore | 4 ++-- patches/eeprom-provide-smaller-code-fo | 4 ++-- patches/homeaxis-function | 4 ++-- patches/m206-always-use-homing-homeing | 4 ++-- patches/m206-save-values-in-eeprom | 4 ++-- patches/makefile-avr-size | 4 ++-- patches/makefile-support-v-1 | 4 ++-- patches/marlin-pde-include-comment-for | 4 ++-- patches/motion-control-max-min | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/meta b/meta index 3f58589..dde3c1f 100644 --- a/meta +++ b/meta @@ -1,16 +1,16 @@ Version: 1 -Previous: 48e7894e072d7bbd7410d4374d939bd5b7029250 -Head: d7be66399cac56d8e3e849daf6573e4c4fa600a3 +Previous: 1dec94efc2113b2221b679ef06167fa008e50967 +Head: 9d990cf5e09c2e8657adb772ce83707ec1cf75d8 Applied: + marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d + add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e + makefile-support-v-1: 5f826531e0328e319ddb53617e4f3ade33537c92 + makefile-avr-size: 560fd88074327c52739beb389cd339c78f009adf + motion-control-max-min: 33f9aa6d9952e7f643bb2f7eba39f7bd1a765f86 + m206-always-use-homing-homeing: 965d378ed7d5793305f1d4fda8d4c39a386660cb + eeprom-provide-smaller-code-fo: 7efd5690d57a016afbe296adc23a652966703635 + m206-save-values-in-eeprom: 59c1673d4b5d6cf92e3cd9d164a88222fe658d69 + homeaxis-function: 9d990cf5e09c2e8657adb772ce83707ec1cf75d8 Unapplied: - marlin-pde-include-comment-for: b8544e039832bd9b6f6b1c5edf28e58e3521fdb2 - add-to-marlin-gitignore: 8bd22fa0d7e4784a6b3f28bfe95d8244a94cd99e - makefile-support-v-1: 4ed0e56489a791b10b984a5621c59a586b67048b - makefile-avr-size: cebf953bfc6edbcd829d29dbed6c4f353fbb1788 - motion-control-max-min: 616260bb13fb8168b426bd9aad38d4a86a9a2b74 - m206-always-use-homing-homeing: a4650fb95974f773aea28e001b4efc900b992527 - eeprom-provide-smaller-code-fo: f9febf60d1742eb6d1ba4d8c6b3e93bed6cc9661 - m206-save-values-in-eeprom: 2a7d1e043404740087b0f72e9ac8e4d4af90a87b - homeaxis-function: 828ac5fbe085e00394b48ab9264fbab6d553e487 Hidden: enable-eeprom-settings: 5d9833e6ae33fa8ce0f0d8323954721e6c3af35b diff --git a/patches/add-to-marlin-gitignore b/patches/add-to-marlin-gitignore index a6b8740..b4a5f9e 100644 --- a/patches/add-to-marlin-gitignore +++ b/patches/add-to-marlin-gitignore @@ -1,5 +1,5 @@ -Bottom: d880bdbb38fe403e9c5c14329f8c597f7aa61915 -Top: 14bc9d1eb448d5d15914da3b747d6bfeb25d4d02 +Bottom: ea0dec1cbcd304d9d1750032f70194ceeb751dd6 +Top: b7add21b1bd3c563a45013d967bebaa01b5078e9 Author: Ian Jackson Date: 2012-08-08 18:32:51 +0100 diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 349f1aa..3d434f3 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: 7e084583c87b600a15270498fb6f4ea1a0905ea2 -Top: b6d9726ae79f8ecc62717c6fa4de84312ec70f15 +Bottom: c2feea4afd56caea863e82cd486423f93f510614 +Top: 5fef2109692f8670c2a81bbe08b6d303f46832ff Author: Ian Jackson Date: 2012-08-04 16:13:25 +0100 diff --git a/patches/homeaxis-function b/patches/homeaxis-function index bb5c45c..effd4e5 100644 --- a/patches/homeaxis-function +++ b/patches/homeaxis-function @@ -1,5 +1,5 @@ -Bottom: d3b079400a0c64d8d0c9442045e7b7b9945aa2e5 -Top: 0decc7c1e59075f6cb5577574384824fb2616c3d +Bottom: 52539e835a54ac0f6858a1c830cc03875bec4769 +Top: 65e89c3d4bc0793f6319f43ce50abe85a5c9509c 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 56a35b2..52d971a 100644 --- a/patches/m206-always-use-homing-homeing +++ b/patches/m206-always-use-homing-homeing @@ -1,5 +1,5 @@ -Bottom: f1a87ebeaf9dd1bf7fbcb3dc2b08e14e6b6b099b -Top: 7e084583c87b600a15270498fb6f4ea1a0905ea2 +Bottom: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9 +Top: c2feea4afd56caea863e82cd486423f93f510614 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 cf070cb..91e9497 100644 --- a/patches/m206-save-values-in-eeprom +++ b/patches/m206-save-values-in-eeprom @@ -1,5 +1,5 @@ -Bottom: b6d9726ae79f8ecc62717c6fa4de84312ec70f15 -Top: d3b079400a0c64d8d0c9442045e7b7b9945aa2e5 +Bottom: 5fef2109692f8670c2a81bbe08b6d303f46832ff +Top: 52539e835a54ac0f6858a1c830cc03875bec4769 Author: Ian Jackson Date: 2012-08-01 21:18:08 +0100 diff --git a/patches/makefile-avr-size b/patches/makefile-avr-size index 2c8c416..69d52c1 100644 --- a/patches/makefile-avr-size +++ b/patches/makefile-avr-size @@ -1,5 +1,5 @@ -Bottom: 0f4749fc55a84a1d7a6a8ba5539b96ad503c0480 -Top: b1472b618e2c4c50d401c9455d84795ed4493277 +Bottom: fe29c935d597df4792c2f9c33288912120351048 +Top: 4fa736aa57e0b7f1687af78e8c0f83fa18dc2549 Author: Ian Jackson Date: 2012-08-09 19:03:12 +0100 diff --git a/patches/makefile-support-v-1 b/patches/makefile-support-v-1 index 29dbe6e..b8352a7 100644 --- a/patches/makefile-support-v-1 +++ b/patches/makefile-support-v-1 @@ -1,5 +1,5 @@ -Bottom: 14bc9d1eb448d5d15914da3b747d6bfeb25d4d02 -Top: 0f4749fc55a84a1d7a6a8ba5539b96ad503c0480 +Bottom: b7add21b1bd3c563a45013d967bebaa01b5078e9 +Top: fe29c935d597df4792c2f9c33288912120351048 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 diff --git a/patches/motion-control-max-min b/patches/motion-control-max-min index 3a2be74..3a8aeb6 100644 --- a/patches/motion-control-max-min +++ b/patches/motion-control-max-min @@ -1,5 +1,5 @@ -Bottom: b1472b618e2c4c50d401c9455d84795ed4493277 -Top: f1a87ebeaf9dd1bf7fbcb3dc2b08e14e6b6b099b +Bottom: 4fa736aa57e0b7f1687af78e8c0f83fa18dc2549 +Top: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9 Author: Ian Jackson Date: 2012-08-09 18:15:32 +0100 -- 2.30.2