[osm-gps-map] 02/11: Merge tag 'upstream/1.1.0'

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit 8aac69a1c654112c68c98e06d3f53287bc3eeb48
Merge: 251573d 9c08374
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sat Nov 21 10:56:26 2015 +0100

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0
    
    # gpg: Signature made Sat 21 Nov 2015 10:56:15 AM CET
    # gpg:                using RSA key 0x733E6BF93CE8F6D9
    # gpg: Good signature from "Ross Gammon (Rosco) <rossgammon at mail.dk>"
    # gpg:                 aka "Ross Gammon (Genealogy) <genealogy at the-gammons.net>"
    # gpg:                 aka "Ross Gammon (www.one-name.org) <gammon at one-name.org>"
    # gpg:                 aka "Ross Gammon (www.the-gammons.net) <ross at the-gammons.net>"
    # gpg:                 aka "[jpeg image of size 3524]"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: FBEE 0190 904F 1EA0 BA6A  300E 53FE 7BBD A689 10FC
    #      Subkey fingerprint: 7AEE BC7A 44AB 8B90 5CA7  8FC6 733E 6BF9 3CE8 F6D9

 Makefile.am                |  18 +-
 NEWS                       |   9 +
 configure.ac               |  15 +-
 docs/reference/Makefile.am |   4 +-
 examples/Makefile.am       |  38 +++-
 examples/README            |   3 +
 examples/editable_track.c  |  42 +++++
 examples/mapviewer.c       |   9 +-
 examples/polygon.c         |  47 +++++
 m4/gtk-doc.m4              |  51 ++++--
 src/Makefile.am            |   2 +
 src/converter.c            |  28 +++
 src/converter.h            |   8 +
 src/osm-gps-map-image.c    |  37 ++++
 src/osm-gps-map-image.h    |   2 +
 src/osm-gps-map-polygon.c  | 185 +++++++++++++++++++
 src/osm-gps-map-polygon.h  |  60 +++++++
 src/osm-gps-map-source.c   |  22 ---
 src/osm-gps-map-source.h   |   3 -
 src/osm-gps-map-track.c    | 125 ++++++++++++-
 src/osm-gps-map-track.h    |  25 +++
 src/osm-gps-map-widget.c   | 434 ++++++++++++++++++++++++++++++++++++++++++---
 src/osm-gps-map-widget.h   |   7 +
 23 files changed, 1069 insertions(+), 105 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git