Merge branch 'libchamplain-0-4'
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Tue, 16 Feb 2010 21:34:55 +0000 (16:34 -0500)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Tue, 16 Feb 2010 21:34:55 +0000 (16:34 -0500)
commit3bff2b38d22e8a102a3acec3cbc0e8f4523a49fb
tree2a6e03bc65e45c953c579aa23ac8f8652e1befa6
parentd0de19fae484bc4eb7cf7a2d567345b5f86325e8
parentf0102a8f257ad449cc859dd4cda02c299918a978
Merge branch 'libchamplain-0-4'
champlain/champlain-marker.c
champlain/champlain-view.c