[cpl-plugin-kmos] 02/02: Merge branch 'debian-template' into debian
Ole Streicher
olebole at moszumanska.debian.org
Tue Mar 31 10:24:20 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-kmos.
commit ee91077121d1cfa207f2c19b32bfaa4362b31ff1
Merge: c418884 c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Mar 31 12:24:09 2015 +0200
Merge branch 'debian-template' into debian
Conflicts:
debian/patches/fix_test_fail.patch
debian/patches/fix_test_fail.patch | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-kmos.git
More information about the debian-science-commits
mailing list