[cpl-plugin-sinfo] 03/03: Merge branch 'debian-template' into debian
Ole Streicher
olebole-guest at alioth.debian.org
Mon Oct 28 16:11:24 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-sinfo.
commit a5d06cff6f47635cdf74198c539133df73c048a9
Merge: 39d9a52 e71afa7
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Oct 28 17:11:10 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-science/packages/cpl-plugin-sinfo.git
More information about the debian-science-commits
mailing list