]> err.no Git - libchamplain/commit
Merge branch 'POI'
authorPierre-Luc Beaudoin <pierre-luc@squidy.info>
Sat, 6 Sep 2008 15:45:51 +0000 (11:45 -0400)
committerPierre-Luc Beaudoin <pierre-luc@squidy.info>
Sat, 6 Sep 2008 15:45:51 +0000 (11:45 -0400)
commit5be94f50aa70711649fab368fe06948fdc6a5be8
treea7af213a572cac684dd3bc05308d36433cb06b3a
parentfc923e289e61b5b819262b1c41dc11a043b9c2e6
parentaaa4207576d33be012d02fbb51c1ed1efd764e42
Merge branch 'POI'

Conflicts:

champlain/champlainview.c
champlain/champlainmarker.h
champlain/champlainview.c
champlain/champlainview.h