[libchamplain: 71/71] Merge branch 'libchamplain-0-4'
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain: 71/71] Merge branch 'libchamplain-0-4'
- Date: Mon, 11 Jan 2010 15:03:06 +0000 (UTC)
commit a681080c3630fa51fe5e9f8e388292116b295dcf
Merge: f563af2 1f06645
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date: Sun Jan 10 16:46:06 2010 -0500
Merge branch 'libchamplain-0-4'
Conflicts:
configure.ac
AUTHORS | 2 +
NEWS | 21 +
bindings/perl/Champlain/.xs-coverage.ignore | 1 +
bindings/perl/Champlain/Changes | 4 +
bindings/perl/Champlain/lib/Champlain.pm | 2 +-
bindings/perl/Champlain/maps | 1 +
bindings/perl/Champlain/t/ChamplainMapSource.t | 25 +-
bindings/perl/Champlain/t/ChamplainMapSourceDesc.t | 2 +-
bindings/perl/Champlain/t/ChamplainMarker.t | 37 ++-
bindings/perl/Champlain/t/ChamplainPolygon.t | 11 +-
bindings/perl/Champlain/t/ChamplainView.t | 54 ++-
bindings/perl/Champlain/xs/ChamplainMapSource.xs | 8 +
bindings/perl/Champlain/xs/ChamplainMarker.xs | 26 +
bindings/perl/Champlain/xs/ChamplainPolygon.xs | 12 +
bindings/perl/Champlain/xs/ChamplainView.xs | 36 ++
bindings/python/champlain-gtk/pychamplaingtk.defs | 2 -
bindings/python/champlain/pychamplain-base.defs | 211 ++++++++-
.../python/champlain/pychamplain-boxed-types.defs | 2 +-
.../python/champlain/pychamplain-constructors.defs | 14 +
bindings/python/champlain/pychamplain.defs | 2 +-
bindings/python/champlain/pychamplain.override | 209 ++++++--
bindings/python/champlain/pychamplainmodule.c | 49 ++-
bindings/python/demos/launcher-gtk.py | 20 +
bindings/python/update-binding.sh | 14 +-
champlain/champlain-defines.h | 6 +
champlain/champlain-map-source-factory.c | 8 +-
champlain/champlain-map-source.c | 32 ++
champlain/champlain-map-source.h | 5 +
champlain/champlain-marker.c | 51 ++-
champlain/champlain-marker.h | 2 +
champlain/champlain-network-map-source.c | 78 ++--
champlain/champlain-polygon.c | 60 +++
champlain/champlain-polygon.h | 3 +
champlain/champlain-private.h | 1 +
champlain/champlain-tile.c | 50 +--
champlain/champlain-version.h.in | 2 +-
champlain/champlain-view.c | 534 +++++++++++++++++++-
champlain/champlain-view.h | 9 +-
demos/launcher-gtk.c | 25 +-
39 files changed, 1410 insertions(+), 221 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]