diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/gpsd/patches/patch-gps_1 | |
parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) |
resolve merge conflict
Diffstat (limited to 'package/gpsd/patches/patch-gps_1')
-rw-r--r-- | package/gpsd/patches/patch-gps_1 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/package/gpsd/patches/patch-gps_1 b/package/gpsd/patches/patch-gps_1 new file mode 100644 index 000000000..23b1b8763 --- /dev/null +++ b/package/gpsd/patches/patch-gps_1 @@ -0,0 +1,17 @@ +--- gpsd-2.92.orig/gps.1 2010-03-01 06:00:44.000000000 +0100 ++++ gpsd-2.92/gps.1 2010-04-03 10:22:50.111390920 +0200 +@@ -2,12 +2,12 @@ + .\" Title: gps + .\" Author: [see the "AUTHORS" section] + .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> +-.\" Date: 03/01/2010 ++.\" Date: 04/03/2010 + .\" Manual: [FIXME: manual] + .\" Source: [FIXME: source] + .\" Language: English + .\" +-.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]" ++.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]" + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- |