On 25/11/14 15:58, Dirk Hohndel wrote:
On Tue, Nov 25, 2014 at 03:48:24PM +0000, Tim Wootton wrote:
On 25/11/14 15:36, Dirk Hohndel wrote:
On Tue, Nov 25, 2014 at 07:34:49AM -0800, Dirk Hohndel wrote:
Not sure what happened here, but look at the patch included below.
Unsurprisingly, git didn't like that very much.

Can you check if there's something odd going on with your encoding
settings? I have never had problems like this with patches from you
before, so something must have changed. Different mail program maybe? Can
you use git send-email ?

Ha. Looking at your headers that's what you did. Linus, any idea why git
send-email would send out such junk?

just ran git format-patch again and the files came out looking way better -
not sure what went on there, don't think I did anything different.

Not sure - but I think I'm missing the last one (PATCH 5/5)? The others
looked great and applied cleanly...
odd as I got 5/5 back via the list, but anyway pls find attached.


/D
.


--- Begin Message ---
Signed-off-by: Tim Wootton <[email protected]>
---
 qt-ui/plannerSettings.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 3e323eb..f99be98 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -525,7 +525,7 @@
           <item row="3" column="0">
            <widget class="QCheckBox" name="verbatim_plan">
             <property name="text">
-             <string>Verbatim diveplan</string>
+             <string>Verbatim dive plan</string>
             </property>
            </widget>
           </item>
-- 
2.1.1

_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

--- End Message ---
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to