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-revision_h | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/gpsd/patches/patch-revision_h')
| -rw-r--r-- | package/gpsd/patches/patch-revision_h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package/gpsd/patches/patch-revision_h b/package/gpsd/patches/patch-revision_h new file mode 100644 index 000000000..98151f235 --- /dev/null +++ b/package/gpsd/patches/patch-revision_h @@ -0,0 +1,5 @@ +--- gpsd-2.92.orig/revision.h 2010-03-03 14:49:28.000000000 +0100 ++++ gpsd-2.92/revision.h 2010-04-03 10:22:22.843473239 +0200 +@@ -1 +1 @@ +-#define REVISION "svn7020" ++#define REVISION "svnexported" |