From: Ian Jackson Date: Fri, 10 Aug 2012 17:10:26 +0000 (+0100) Subject: pop X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=35b2376b1033ea44c06a1a2855057614a69604f3;p=marlin.git pop --- diff --git a/meta b/meta index 9eb4a66..15f29b6 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 081bf1e752a0a2a6a885f6b78687aec0e8f95ad8 -Head: 31068042f1ce0c442be19a8055046f62716403b2 +Previous: 10d4847d20e15d21478f73d8cd5c2095efb0a797 +Head: c2c2e0a6e303900d56798ee6186ea114f97c4ed2 Applied: marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e @@ -8,9 +8,9 @@ Applied: makefile-avr-size: b1f12330781628c6463068489f7f052bf791bf0e motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f m206-always-use-homing-homeing: 31068042f1ce0c442be19a8055046f62716403b2 + eeprom-provide-smaller-code-fo: 6b046bd18df9dd39bf5ed13f266918c34b5ab598 + homeaxis-function: d969332eca2f45463ace33a1bc91723bf8cb8ff3 + m206-save-values-in-eeprom: c2c2e0a6e303900d56798ee6186ea114f97c4ed2 Unapplied: - eeprom-provide-smaller-code-fo: a18cc767374a4f34713ab94fc092449a1422a821 - homeaxis-function: 75f381b9093a96a67f8aa4fb0a668a4cf2e048e8 - m206-save-values-in-eeprom: 8afc835054a7974385e446be93265b10de010af8 Hidden: enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index dc8022b..1ccdc7b 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: ade905244c4ab6ec25fa2d2a2409a15a78d1e8e4 -Top: da29116f21970312595da6db4896c228dace90f1 +Bottom: a47c445c515e8480838e04500acc170cc895298e +Top: e8f1ac68845d759fcca286c4e4aa55a20a35f4b2 Author: Ian Jackson Date: 2012-08-04 16:13:25 +0100 diff --git a/patches/homeaxis-function b/patches/homeaxis-function index 28b75ad..662b011 100644 --- a/patches/homeaxis-function +++ b/patches/homeaxis-function @@ -1,5 +1,5 @@ -Bottom: da29116f21970312595da6db4896c228dace90f1 -Top: 75d4a31db3e7cb32ded340b9de197cee58e943b7 +Bottom: e8f1ac68845d759fcca286c4e4aa55a20a35f4b2 +Top: 1e45527396d18a734fba0181fbbfbf3709b52c95 Author: Ian Jackson Date: 2012-08-08 18:30:34 +0100 diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom index 343695c..b068979 100644 --- a/patches/m206-save-values-in-eeprom +++ b/patches/m206-save-values-in-eeprom @@ -1,5 +1,5 @@ -Bottom: 75d4a31db3e7cb32ded340b9de197cee58e943b7 -Top: cc6523d97cb3b3bd3dd5c82c0b400e886719ab01 +Bottom: 1e45527396d18a734fba0181fbbfbf3709b52c95 +Top: 742b5660b5324fd909a5fb552158d585c216b3c1 Author: Ian Jackson Date: 2012-08-01 21:18:08 +0100