[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [gpsd-dev] [PATCH v1 1/1] gps2udp: add a 'pack' mode

From: Mike Frysinger
Subject: Re: [gpsd-dev] [PATCH v1 1/1] gps2udp: add a 'pack' mode
Date: Fri, 3 Jan 2014 09:15:27 -0500
User-agent: KMail/1.13.7 (Linux/3.12.1; KDE/4.6.5; x86_64; ; )

On Friday 03 January 2014 09:08:32 Ferry Huberts wrote:
> From: Ferry Huberts <address@hidden>
> -p flush-phrase Will pack all sentences that start with a '$' character
>    in a single packet. The packet will be sent when a sentence is
>    received from the gpsd daemon that starts with the flush-phrase.
> Signed-off-by: Ferry Huberts <address@hidden>
> Conflicts:
>       gps2udp.c

you should rebase onto the latest master and remove the Conflicts part.  how 
you do local merges isn't really of interest to long term history.

Attachment: signature.asc
Description: This is a digitally signed message part.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]