[med-svn] [python-mne] 03/04: Merge tag 'upstream/0.7'

[Andreas Tille]

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

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

commit cc40bbb9d4ff05d842349a7bd54748990e79c65b
Merge: 51d8126 907acd7
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 26 19:35:36 2013 +0100

    Merge tag 'upstream/0.7'
    
    Upstream version 0.7

 .mailmap                                           |  18 +++++--
 .../_images/plot_read_and_write_raw_data.png       | Bin 61418 -> 238712 bytes
 doc/source/_images/plot_read_epochs.png            | Bin 186065 -> 124444 bytes
 doc/source/cite.rst                                |   2 +-
 doc/source/python_reference.rst                    |  52 ++++++++++++++++++++-
 doc/source/python_tutorial.rst                     |   3 +-
 doc/source/whats_new.rst                           |  22 +++++----
 examples/plot_simulate_evoked_data.py              |   1 -
 mne/__init__.py                                    |   2 +-
 mne/datasets/spm_face/__init__.py                  |   2 +-
 mne/fiff/pick.py                                   |  19 ++++----
 mne/fiff/raw.py                                    |   6 +++
 12 files changed, 100 insertions(+), 27 deletions(-)

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