]> err.no Git - libchamplain/commit
Merge branch 'master' of git://gitorious.org/libchamplain-gtk/mainline
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Thu, 12 Feb 2009 19:46:45 +0000 (21:46 +0200)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Thu, 12 Feb 2009 19:46:45 +0000 (21:46 +0200)
commit95a920580bd829c0e3614b76e8a9fba01b1e8ac2
tree7b6d69eb7f7facc1cbca37bcd074710f941e9011
parent1bc7693a2aa02cbcdff1f05980b429e4743b7265
parent34be5d3c364381be44102ad63019dc96fb2e430f
Merge branch 'master' of git://gitorious.org/libchamplain-gtk/mainline
Make libchamplain and libchamplain-gtk in one repo

Conflicts:

INSTALL
Makefile.am
NEWS
configure.ac
demos/Makefile.am
demos/launcher.c
docs/reference/Makefile.am
Makefile.am
champlain-gtk/Makefile.am
configure.ac
demos/Makefile.am
demos/launcher-gtk.c
docs/reference/Makefile.am