[python-pyraf] 04/04: Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/python-pyraf into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Jan 31 17:04:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository python-pyraf.
commit 9caf52a5fec6c5e916fb32de9cc6145022b85f64
Merge: b40e1e8 6555220
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Jan 31 18:04:31 2014 +0100
Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/python-pyraf into debian
Conflicts:
PKG-INFO
debian/changelog
lib/pyraf.egg-info/PKG-INFO
lib/pyraf/version.py
lib/pyraf/version.py.orig1
lib/pyraf/version.py.orig2
lib/pyraf/wutil.py
lib/pyraf_setup.pyc
required_pkgs/stsci.distutils/CHANGES.txt
required_pkgs/stsci.distutils/setup.cfg
required_pkgs/stsci.tools/lib/stsci/tools/capable.py
setup.cfg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-pyraf.git
More information about the debian-science-commits
mailing list