[cpl-plugin-sinfo] 01/01: Merge branch 'debian-template' into debian
Ole Streicher
olebole at moszumanska.debian.org
Tue Mar 31 09:58:19 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-sinfo.
commit bfdd69c2ff3c4315269b0204e2605fd45c76fb87
Merge: 07db06a 3d6a148
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Mar 31 11:58:14 2015 +0200
Merge branch 'debian-template' into debian
Conflicts:
debian/control
debian/README.Debian.in | 2 +-
debian/README.Source | 2 +-
debian/repackage.sh | 14 ++++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-sinfo.git
More information about the debian-science-commits
mailing list