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 17f9589bf4d2635cbe64366b7c9a530eb326e0de
Merge: ef2a87a a9010f5
Author: David Paleino <da...@debian.org>
Date:   Thu Jun 3 07:54:20 2010 +0200

    Merge commit 'upstream/0.7.0'

 .gitignore                                         |    4 +-
 ChangeLog                                          |    0
 Makefile.am                                        |   31 +-
 NEWS                                               |   41 +
 autogen.sh                                         |  151 +-
 configure.ac                                       |   39 +-
 docs/Makefile.am                                   |    1 +
 docs/reference/Makefile.am                         |   95 +
 docs/reference/libosmgpsmap-docs.xml               |   38 +
 docs/reference/libosmgpsmap-overrides.txt          |    0
 docs/reference/libosmgpsmap-sections.txt           |  112 ++
 docs/reference/libosmgpsmap.types                  |    6 +
 docs/reference/version.xml.in                      |    1 +
 examples/.gitignore                                |    1 +
 examples/Makefile.am                               |   35 +
 examples/env.sh                                    |    3 +
 examples/mapviewer.c                               |  391 ++++
 examples/mapviewer.js                              |   28 +
 {python => examples}/mapviewer.py                  |   56 +-
 examples/mapviewer.ui                              |  378 ++++
 {src => examples}/poi.png                          |  Bin
 m4/.gitignore                                      |    1 +
 m4/gtk-doc.m4                                      |   61 +
 m4/introspection.m4                                |   94 +
 python/.gitignore                                  |    2 +
 python/COPYING                                     |    1 +
 python/Makefile.am                                 |   20 +-
 python/configure.ac                                |   42 +-
 python/m4/.gitignore                               |    1 +
 .../am_check_python_headers.m4}                    |   38 -
 python/osmgpsmap-compat.defs                       |  113 ++
 python/osmgpsmap.defs                              |  508 ++++--
 python/osmgpsmap.override                          |  199 ++-
 python/setup.py                                    |    9 +-
 src/.gitignore                                     |    2 +
 src/Makefile.am                                    |  134 +-
 src/main.c                                         |  318 ----
 src/osm-gps-map-compat.c                           |  163 ++
 src/osm-gps-map-compat.h                           |   27 +
 src/osm-gps-map-image.c                            |  194 ++
 src/osm-gps-map-image.h                            |   44 +
 src/osm-gps-map-layer.h                            |    2 +-
 src/osm-gps-map-osd.c                              |   35 +-
 src/osm-gps-map-point.c                            |   71 +
 src/osm-gps-map-point.h                            |   33 +
 src/osm-gps-map-source.c                           |  182 ++
 src/osm-gps-map-source.h                           |   39 +
 src/osm-gps-map-track.c                            |  241 +++
 src/osm-gps-map-track.h                            |   46 +
 src/osm-gps-map-types.h                            |   66 +-
 src/{osm-gps-map.c => osm-gps-map-widget.c}        | 1858 ++++++++++++--------
 src/osm-gps-map-widget.h                           |  117 ++
 src/osm-gps-map.h                                  |  145 +-
 53 files changed, 4400 insertions(+), 1817 deletions(-)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to