From: Ian Jackson Date: Wed, 8 Aug 2012 17:14:11 +0000 (+0100) Subject: pop X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2829f50f93bcee543de803329587e7bc8fded762;p=marlin.git pop --- diff --git a/meta b/meta index de3e07c..fc7e1fc 100644 --- a/meta +++ b/meta @@ -1,11 +1,11 @@ Version: 1 -Previous: 2a3869c4ed89ed723fbb7e5558b0af5e6ab352b3 -Head: a3514f7d682a6a223f2a575320d8961454a5a283 +Previous: b1e82bbd75cd63e1617f19468cdf455ca58e4705 +Head: 29382a47102b3507e1e3c077280b65de11b30b95 Applied: enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c marlin-pde-include-comment-for: a3514f7d682a6a223f2a575320d8961454a5a283 + makefile-support-v-1: 29382a47102b3507e1e3c077280b65de11b30b95 Unapplied: - makefile-support-v-1: 4b98b847ffa96793fd76bf092b3c567fa77befe3 m206-always-use-homing-homeing: c7ddc4372e205d4fe6a85249f8824228def4381c eeprom-provide-smaller-code-fo: 4361c56748aadf86df770de046a3e582c2d09207 m206-save-values-in-eeprom: 1ea282dc0ff2eba5e864ecaae075a42600788661 diff --git a/patches/makefile-support-v-1 b/patches/makefile-support-v-1 index b5fa56c..f617ca6 100644 --- a/patches/makefile-support-v-1 +++ b/patches/makefile-support-v-1 @@ -1,5 +1,5 @@ -Bottom: a12e527f99d31c2ec299f86773250e3a56d45be7 -Top: edae50b56c97ff463772def17cefd1e042d80ee7 +Bottom: d880bdbb38fe403e9c5c14329f8c597f7aa61915 +Top: caf3bde1f429359b50d48a857bebab2dc6615ed9 Author: Ian Jackson Date: 2012-08-01 21:31:38 +0100