[med-svn] [python-mne] 01/01: Merge tag 'upstream/0.7.1'

[Alexandre Gramfort]

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

agramfort-guest pushed a commit to branch master
in repository python-mne.

commit 272dd78a1d2b1c94cf651fdd2b32e234a657539d
Merge: 0922260 d83144d
Author: Alexandre Gramfort <alexandre.gramfort at m4x.org>
Date:   Wed Jan 8 16:38:28 2014 +0100

    Merge tag 'upstream/0.7.1'
    
    Upstream version 0.7.1

 MANIFEST.in                          |   1 +
 Makefile                             |   2 +-
 bin/mne                              |   2 +-
 doc/source/_static/institutions.png  | Bin 0 -> 71392 bytes
 doc/source/_static/logo.png          | Bin 175727 -> 0 bytes
 doc/source/_static/mne_logo.png      | Bin 0 -> 77583 bytes
 doc/source/_templates/layout.html    |  12 ++++++++++--
 doc/source/index.rst                 |   7 +++++++
 doc/source/python_reference.rst      |   4 ++--
 doc/source/whats_new.rst             |  29 +++++++++++++++++++++++++++++
 doc/upload_html.sh                   |   4 ++--
 mne/__init__.py                      |   2 +-
 mne/coreg.py                         |   6 +++---
 mne/fiff/edf/edf.py                  |   9 +++++----
 mne/fiff/edf/tests/data/biosemi.hpts |   2 +-
 mne/fiff/edf/tests/test_edf.py       |   7 ++++++-
 mne/gui/__init__.py                  |   4 ++--
 mne/gui/_coreg_gui.py                |  13 ++++++++-----
 mne/gui/_file_traits.py              |   3 +++
 mne/gui/tests/test_coreg_gui.py      |   7 +++++++
 20 files changed, 89 insertions(+), 25 deletions(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git