Skip to content

Commit

Permalink
Merge branch 'release/v2.0.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
MaJerle committed Jul 3, 2020
2 parents 8ea618b + b0dec70 commit 0984e31
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
author = 'Tilen MAJERLE'

# The full version, including alpha/beta/rc tags
version = '1.2.0'
version = '2.0.0'

# Try to get branch at which this is running
# and try to determine which version to display in sphinx
Expand Down
2 changes: 1 addition & 1 deletion lwgps/src/include/lwgps/lwgps.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwGPS - Lightweight GPS NMEA parser library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v1.1.0
* Version: v2.0.0
*/
#ifndef LWGPS_HDR_H
#define LWGPS_HDR_H
Expand Down
4 changes: 2 additions & 2 deletions lwgps/src/lwgps/lwgps.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of LwGPS - Lightweight GPS NMEA parser library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v1.1.0
* Version: v2.0.0
*/
#include <math.h>
#include <string.h>
Expand Down Expand Up @@ -315,7 +315,7 @@ prv_parse_term(lwgps_t* gh) {
gh->p.data.time.utc_wk = prv_parse_number(gh, NULL);
break;
case 6: /* Process UTC leap seconds */
/*
/*
* Accomodate a 2- or 3-digit leap second count
* a trailing 'D' means this is the firmware's default value.
*/
Expand Down

0 comments on commit 0984e31

Please sign in to comment.