From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Aug 2012 16:56:53 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3ba91967ad2cfcbbf9e31af767b1e74f15c9b47f;p=marlin.git

refresh
---

diff --git a/meta b/meta
index c1e0b6b..7ce050b 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 05162ba0cafdf9265c19e3f8f2422b6193035e74
-Head: 819b7f7d969a6aa48d1984de3cbc9f4e284c1806
+Previous: 47c9e7761076017a893d6e485a3340f622b0c0c1
+Head: 78a2b7d92b8ee452c22db01b3236ad16047533c2
 Applied:
   makefile-support-v-1: 59de9f09a248a5af04203378018ff95f86ff092d
   m206-always-use-homing-homeing: 704568f265fbb370658a153f8240239dd776f5cc
   eeprom-provide-smaller-code-fo: 3f690257c022b5c6945f7d2f070c89ee1c8275c8
-  marlin-pde-include-comment-for: 82fb91928338ba8bea305c15e6fbcaa4a0056140
-  refresh-temp: 819b7f7d969a6aa48d1984de3cbc9f4e284c1806
+  marlin-pde-include-comment-for: 78a2b7d92b8ee452c22db01b3236ad16047533c2
 Unapplied:
   m206-save-values-in-eeprom: a7ff3675bdb6149f684e0e3a15c1a594ea2db815
 Hidden:
diff --git a/patches/marlin-pde-include-comment-for b/patches/marlin-pde-include-comment-for
index 6b2969c..7864ff9 100644
--- a/patches/marlin-pde-include-comment-for
+++ b/patches/marlin-pde-include-comment-for
@@ -1,5 +1,5 @@
 Bottom: f71276ce0bb76f5c8c5c3c6cdb0be4e72eb00f48
-Top:    f71276ce0bb76f5c8c5c3c6cdb0be4e72eb00f48
+Top:    2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:56:39 +0100
 
@@ -13,4 +13,13 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 
 ---
 
-
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index d0c8d79..1dec2b8 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -1,3 +1,5 @@
++/* -*- c++ -*- */
++
+ /*
+     Reprap firmware based on Sprinter and grbl.
+  Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 193e195..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,19 +0,0 @@
-Bottom: f71276ce0bb76f5c8c5c3c6cdb0be4e72eb00f48
-Top:    2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-08 17:56:53 +0100
-
-Refresh of marlin-pde-include-comment-for
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index d0c8d79..1dec2b8 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -1,3 +1,5 @@
-+/* -*- c++ -*- */
-+
- /*
-     Reprap firmware based on Sprinter and grbl.
-  Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm