Merge branch 'libchamplain-0-4'
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Sun, 10 Jan 2010 21:46:06 +0000 (16:46 -0500)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Sun, 10 Jan 2010 21:46:06 +0000 (16:46 -0500)
commita681080c3630fa51fe5e9f8e388292116b295dcf
treef455980bec5256f6287f540dac2c60838fba6f7e
parentf563af2fe35ac83c3811f306107026fde022c5ae
parent1f066450c8edb312cb08b5038c714fd883af0085
Merge branch 'libchamplain-0-4'

Conflicts:
configure.ac
AUTHORS
champlain/champlain-map-source.c
champlain/champlain-map-source.h
champlain/champlain-polygon.c
champlain/champlain-view.c