diff options
| author | Jason Reiss <jreiss@multitech.com> | 2015-10-21 15:58:43 -0500 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2015-10-21 15:58:43 -0500 |
| commit | eb60c9c535be9a16e7f63084f23dd1b687f30ec3 (patch) | |
| tree | f7e9f8bb6af048f00c14106b0c4ec1f80226459e /recipes-connectivity/lora/lora-packet-forwarder | |
| parent | 2fc8b56bf20c37791931f42359b8099b04808015 (diff) | |
| parent | 345cfbb0c73f47dcbbe28d50edd8b15b9090a68f (diff) | |
| download | meta-mlinux-eb60c9c535be9a16e7f63084f23dd1b687f30ec3.tar.gz meta-mlinux-eb60c9c535be9a16e7f63084f23dd1b687f30ec3.tar.bz2 meta-mlinux-eb60c9c535be9a16e7f63084f23dd1b687f30ec3.zip | |
Merge branch 'master' of git.multitech.net:meta-mlinux
Conflicts:
recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch
Diffstat (limited to 'recipes-connectivity/lora/lora-packet-forwarder')
| -rw-r--r-- | recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch index bef41c9..cd9a727 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch +++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder-add-queue.patch @@ -159,8 +159,8 @@ index e20dfc1..4d0bb35 100644 } MSG("\nINFO: End of downstream thread\n"); } - -diff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c + +iff --git a/gps_pkt_fwd/src/gps_pkt_fwd.c b/gps_pkt_fwd/src/gps_pkt_fwd.c index 79f7584..3d1cbf8 100644 --- a/gps_pkt_fwd/src/gps_pkt_fwd.c +++ b/gps_pkt_fwd/src/gps_pkt_fwd.c |