]> err.no Git - libchamplain/commit
Merge branch 'master' of git@gitorious.org:libchamplain/mainline.git
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Wed, 19 Nov 2008 16:25:49 +0000 (11:25 -0500)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Wed, 19 Nov 2008 16:25:49 +0000 (11:25 -0500)
commita21449fe91988168916ab1da069c3f59dbfab23c
tree852f6cd29892976e2554ffc9eadc2e8e33dc7342
parente703e8df2cbdc591c3171f78658e75521b5c9315
parent0faaf090bf2250f415512fdf1866ff5e0f6d274d
Merge branch 'master' of git@gitorious.org:libchamplain/mainline.git

Conflicts:

demos/launcher.c
champlain/champlainview.c