[python-cpl] 03/04: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at alioth.debian.org
Sun Nov 3 19:47:19 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository python-cpl.
commit 0f7fb69668ecbfab88ded2210a3dba0bbb7eeb70
Merge: 13b111b 34fbc2c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Nov 3 20:03:57 2013 +0100
Merge branch 'upstream' into debian
PKG-INFO | 14 +++----
README | 6 +--
cpl/CPL_library.c | 5 +++
cpl/CPL_library.h | 4 ++
cpl/CPL_recipe.c | 70 ++++++++++++++++++++++++++---------
cpl/__init__.py | 23 ++++++------
cpl/cpl_api.h | 9 ++++-
cpl/dfs.py | 26 +++++++------
cpl/esorex.py | 9 +++--
cpl/frames.py | 17 +++++----
cpl/param.py | 31 +++++++++-------
cpl/recipe.py | 105 +++++++++++++++++++++++++++++++++++------------------
cpl/result.py | 50 +++++++++++++++----------
cpl/version.py | 4 +-
setup.py | 14 +++++--
15 files changed, 252 insertions(+), 135 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-cpl.git
More information about the debian-science-commits
mailing list