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 56ae13b841adfdeeceba57f1216943e36e2d72c0
Merge: 5f6e4f9 a8858ed
Author: David Paleino <da...@debian.org>
Date:   Wed Feb 10 15:29:40 2010 +0100

    Merge commit 'upstream/0.6.0'

 COPYING                   | 911 +++++++++++++++------------------------------
 Makefile.am               |   2 +-
 NEWS                      |   9 +
 configure.ac              |  16 +-
 python/Makefile.am        |   2 +-
 python/configure.ac       |   2 +-
 python/mapviewer.py       |  50 ++-
 python/osmgpsmap.defs     | 105 ++++++
 python/osmgpsmap.override |   3 +
 python/osmgpsmapmodule.c  |  23 +-
 python/setup.py           |   2 +-
 src/Makefile.am           |  10 +-
 src/converter.c           |  21 +-
 src/converter.h           |  21 +-
 src/main.c                |  36 +-
 src/osd-utils.c           | 393 ++++++++++++++++++++
 src/osd-utils.h           |  51 +++
 src/osm-gps-map-layer.c   |  59 +++
 src/osm-gps-map-layer.h   |  62 ++++
 src/osm-gps-map-osd.c     | 916 ++++++++++++++++++++++++++++++++++++++++++++++
 src/osm-gps-map-osd.h     |  57 +++
 src/osm-gps-map-types.h   |  29 +-
 src/osm-gps-map.c         | 222 ++++++++---
 src/osm-gps-map.h         |  26 +-
 24 files changed, 2268 insertions(+), 760 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