[Debian-astro-commits] [cpl-plugin-template] 34/76: Merge branch 'debian-template' into debian
Ole Streicher
olebole at moszumanska.debian.org
Wed Sep 23 09:59:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl-plugin-template.
commit 46e4ff88c646757b2d3e390c9ea26019645e3b41
Merge: 42a2577 f8add71
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Oct 28 22:53:55 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/cpl-plugin.doc-base.in
debian/cpl-plugin.doc-base.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-template.git
More information about the Debian-astro-commits
mailing list