[python-dtcwt] 263/497: Merge branch 'master' into add-badges-to-readme

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit 7c0ad9df12d58706786192ed52a031714e7f79dc
Merge: c97cc31 9bfce78
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Thu Jan 30 11:18:36 2014 +0000

    Merge branch 'master' into add-badges-to-readme
    
    Conflicts:
    	README.rst

 .coveragerc                      |   7 ++
 .travis.yml                      |   3 +
 README.rst                       |   4 +
 dtcwt/registration.py            | 145 +++++++++++++++++++++----------
 dtcwt/utils.py                   |  45 ++++++++++
 examples/image-registration-1.py |   2 +-
 examples/image-registration-2.py |   8 +-
 examples/register_images.py      |  64 ++++++++++++++
 examples/register_video.py       | 180 +++++++++++++++++++++++++++++++++++++++
 tests/testregistration.py        |  10 ++-
 tests/testutils.py               |  89 ++++++++++++++++++-
 11 files changed, 502 insertions(+), 55 deletions(-)

diff --cc README.rst
index d98b1d1,51f7deb..8414c6d
--- a/README.rst
+++ b/README.rst
@@@ -8,17 -8,8 +8,21 @@@ transforms and their inverse in Python
  .. image:: https://travis-ci.org/rjw57/dtcwt.png?branch=master
      :target: https://travis-ci.org/rjw57/dtcwt
  
+ .. image:: https://coveralls.io/repos/rjw57/dtcwt/badge.png
 -   :target: https://coveralls.io/r/rjw57/dtcwt
++    :target: https://coveralls.io/r/rjw57/dtcwt
++    :alt: Coverage
++
 +.. image:: https://pypip.in/license/dtcwt/badge.png
 +    :target: https://pypi.python.org/pypi/dtcwt/
 +    :alt: License
 +
 +.. image:: https://pypip.in/v/dtcwt/badge.png
 +    :target: https://pypi.python.org/pypi/dtcwt/
 +    :alt: Latest Version
 +
 +.. image:: https://pypip.in/d/dtcwt/badge.png
 +    :target: https://pypi.python.org/pypi//dtcwt/
 +    :alt: Downloads
  
  Installation
  ````````````

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git