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 ca32b10fccb862199676d22eec7c94eedf96ed73 Merge: bfa6764 9e41807 Author: David Paleino <da...@debian.org> Date: Fri Jun 25 07:21:39 2010 +0200 Merge commit 'upstream/0.7.1' Conflicts: python/COPYING .gitignore | 2 - ChangeLog | 0 NEWS | 6 + configure.ac | 4 +- examples/Makefile.am | 2 +- examples/mapviewer.c | 17 +- examples/mapviewer.js | 16 +- examples/mapviewer.py | 7 +- python/COPYING | 674 +++++++++++++++++++++++++++++++++ python/README | 24 +- python/configure.ac | 4 +- python/osmgpsmap.defs | 6 +- python/osmgpsmap.override | 4 +- python/setup.py | 2 +- src/Makefile.am | 6 +- src/converter.c | 2 +- src/osd-utils.c | 2 - src/osm-gps-map-source.c | 4 +- src/osm-gps-map-track.c | 7 +- src/osm-gps-map-track.h | 2 +- src/osm-gps-map-widget.c | 130 ++++++- src/{osm-gps-map-types.h => private.h} | 10 +- 22 files changed, 847 insertions(+), 84 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