Merge branch 'libchamplain-0-4'
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Tue, 2 Feb 2010 21:40:56 +0000 (16:40 -0500)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Tue, 2 Feb 2010 21:40:56 +0000 (16:40 -0500)
commit84811366633b33418bfcc4e5226c60391b006034
treed3729e74fdd710a616297f8762a8a34d4c7da36c
parenta2dea0eeb45f145b7d8869111abb7c4d57a9f76c
parentef14ca5f7448366dde169f3648e6b0ce4dc21b25
Merge branch 'libchamplain-0-4'

Conflicts:
NEWS
champlain/champlain-cache.c
champlain/champlain-map-source-factory.h
champlain/champlain-network-map-source.c
champlain/champlain-view.c
configure.ac
NEWS
bindings/python/champlain/Makefile.am
champlain/champlain-file-cache.c
champlain/champlain-map-source-factory.h
champlain/champlain-view.c
configure.ac
demos/launcher-gtk.c