[Debian-astro-commits] [cpl-plugin-template] 32/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 01e195efa7c86a2436bb412889fa6e42bb4c7c1e
Merge: 948db97 e71afa7
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Oct 28 17:07:32 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/cpl-plugin.doc-base.in
debian/cpl-plugin.doc-base.in | 23 +++++++++--------
debian/create_sphinx.py | 59 +++++++++++++++++++++++++++----------------
2 files changed, 50 insertions(+), 32 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