[libchamplain/libchamplain-0-12: 132/134] Merge branch 'master' into libchamplain-0-12

[Jiří Techet <jiritechet src gnome org>]

commit ca218c19eb6b6edee49ad63071a8ef49d81b21e4
Merge: 8075e85 0ef0b54
Author: Jiří Techet <techet gmail com>
Date:   Thu May 16 18:24:27 2013 +0200

    Merge branch 'master' into libchamplain-0-12
    
    Conflicts:
        configure.ac

 AUTHORS                                        |    1 +
 README                                         |    2 +-
 champlain-gtk/gtk-champlain-embed.c            |   39 +-
 champlain/Makefile.am                          |    3 -
 champlain/champlain-0.12.vapi                  |   68 +-
 champlain/champlain-adjustment.c               |  229 +---
 champlain/champlain-adjustment.h               |   19 +-
 champlain/champlain-bounding-box.c             |   23 +
 champlain/champlain-bounding-box.h             |    4 +
 champlain/champlain-coordinate.c               |    2 +-
 champlain/champlain-coordinate.h               |    2 +-
 champlain/champlain-custom-marker.c            |  235 +----
 champlain/champlain-custom-marker.h            |    9 +-
 champlain/champlain-error-tile-renderer.c      |   95 +-
 champlain/champlain-error-tile-renderer.h      |    2 +-
 champlain/champlain-file-cache.c               |    2 +-
 champlain/champlain-file-cache.h               |    2 +-
 champlain/champlain-file-tile-source.c         |    2 +-
 champlain/champlain-file-tile-source.h         |    2 +-
 champlain/champlain-group.c                    |  507 ---------
 champlain/champlain-group.h                    |  108 --
 champlain/champlain-image-renderer.c           |   34 +-
 champlain/champlain-image-renderer.h           |    2 +-
 champlain/champlain-kinetic-scroll-view.c      |  372 +------
 champlain/champlain-kinetic-scroll-view.h      |    7 +-
 champlain/champlain-label.c                    |  369 +++----
 champlain/champlain-label.h                    |    2 +-
 champlain/champlain-layer.c                    |    2 +-
 champlain/champlain-layer.h                    |    2 +-
 champlain/champlain-license.c                  |  121 +--
 champlain/champlain-license.h                  |    2 +-
 champlain/champlain-location.c                 |    2 +-
 champlain/champlain-location.h                 |    2 +-
 champlain/champlain-map-source-chain.c         |    2 +-
 champlain/champlain-map-source-chain.h         |    2 +-
 champlain/champlain-map-source-desc.c          |    4 +-
 champlain/champlain-map-source-desc.h          |    2 +-
 champlain/champlain-map-source-factory.c       |   36 +-
 champlain/champlain-map-source-factory.h       |   31 +-
 champlain/champlain-map-source.c               |    2 +-
 champlain/champlain-map-source.h               |    2 +-
 champlain/champlain-marker-layer.c             |  307 ++----
 champlain/champlain-marker-layer.h             |    2 +-
 champlain/champlain-marker.c                   |   92 +-
 champlain/champlain-marker.h                   |    4 +-
 champlain/champlain-memory-cache.c             |    2 +-
 champlain/champlain-memory-cache.h             |    2 +-
 champlain/champlain-memphis-renderer.c         |   89 +-
 champlain/champlain-memphis-renderer.h         |    2 +-
 champlain/champlain-network-bbox-tile-source.c |    2 +-
 champlain/champlain-network-bbox-tile-source.h |    2 +-
 champlain/champlain-network-tile-source.c      |   10 +-
 champlain/champlain-network-tile-source.h      |    2 +-
 champlain/champlain-null-tile-source.c         |    2 +-
 champlain/champlain-null-tile-source.h         |    2 +-
 champlain/champlain-path-layer.c               |  214 ++---
 champlain/champlain-path-layer.h               |    2 +-
 champlain/champlain-point.c                    |  149 +--
 champlain/champlain-point.h                    |    2 +-
 champlain/champlain-renderer.c                 |    2 +-
 champlain/champlain-renderer.h                 |    2 +-
 champlain/champlain-scale.c                    |  212 +---
 champlain/champlain-scale.h                    |    2 +-
 champlain/champlain-tile-cache.c               |    2 +-
 champlain/champlain-tile-cache.h               |    2 +-
 champlain/champlain-tile-source.c              |    6 +-
 champlain/champlain-tile-source.h              |    2 +-
 champlain/champlain-tile.c                     |  157 +---
 champlain/champlain-tile.h                     |    2 +-
 champlain/champlain-version.h.in               |    6 +-
 champlain/champlain-view.c                     | 1395 ++++++++++++------------
 champlain/champlain-view.h                     |   10 +-
 champlain/champlain-viewport.c                 |  379 ++-----
 champlain/champlain-viewport.h                 |   18 +-
 champlain/champlain.h                          |    2 +-
 configure.ac                                   |    4 +-
 demos/Makefile.am                              |   10 +-
 demos/animated-marker.c                        |  136 ++-
 demos/create-destroy-test.c                    |    4 +-
 demos/launcher-gtk.c                           |   15 +-
 demos/launcher-vala.vala                       |   21 +-
 demos/launcher.c                               |   71 ++-
 demos/launcher.js                              |   24 +-
 demos/local-rendering.c                        |  115 +-
 demos/minimal-gtk.c                            |    2 +-
 demos/minimal.c                                |    6 +-
 demos/minimal.py                               |    2 -
 demos/polygons.c                               |   19 +-
 demos/polygons.py                              |   19 +-
 demos/url-marker.c                             |   65 +-
 docs/reference-gtk/libchamplain-gtk-docs.sgml  |    2 +-
 docs/reference/Makefile.am                     |    3 +-
 docs/reference/libchamplain-docs.sgml          |    2 +-
 docs/reference/libchamplain-sections.txt       |   10 +-
 94 files changed, 2040 insertions(+), 3930 deletions(-)
---