From: Ian Jackson Date: Thu, 9 Aug 2012 18:02:20 +0000 (+0100) Subject: pop X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6f6a88e3d77370b21e23f421c7cb51881ce1e5f2;p=marlin.git pop --- diff --git a/meta b/meta index 4440166..9fe4762 100644 --- a/meta +++ b/meta @@ -1,11 +1,11 @@ Version: 1 -Previous: e3b322df844cf324ff0d276da6f06f4090cc6a44 -Head: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976 +Previous: 6afac17708d1836c8e72b06306c31ba34d4ae43b +Head: 90c247c0f2f80ca736bb1d43ff738460f0d1a824 Applied: marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133 add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976 + makefile-support-v-1: 90c247c0f2f80ca736bb1d43ff738460f0d1a824 Unapplied: - makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3 motion-control-max-min: 44befa5f783994f92f7c6fd39b7f581cf174d9d4 m206-always-use-homing-homeing: 5c4da74300c80f25a333307be1768e7eb4c24325 eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba diff --git a/patches/makefile-support-v-1 b/patches/makefile-support-v-1 index 588ecd9..b8352a7 100644 --- a/patches/makefile-support-v-1 +++ b/patches/makefile-support-v-1 @@ -1,5 +1,5 @@ -Bottom: 68d4c4e12d84bd72af570706e1383a0fab8cbfaa -Top: eb35f0d7db096a862ee737a5537019f96d6e6f16 +Bottom: b7add21b1bd3c563a45013d967bebaa01b5078e9 +Top: fe29c935d597df4792c2f9c33288912120351048 Author: Ian Jackson Date: 2012-08-01 21:31:38 +0100