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

[Andreas Tille]

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

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

commit 429b30e57e949c834fd9abe8e82ba22ec4153c7e
Merge: ebb4069 74f36b1
Author: Andreas Tille <tille at debian.org>
Date:   Mon Nov 25 22:58:06 2013 +0100

    Merge tag 'upstream/0.7_rc5'
    
    Upstream version 0.7~rc5

 doc/source/getting_started.rst                     |    9 +-
 doc/source/python_reference.rst                    |    9 +
 doc/source/whats_new.rst                           |   22 +-
 .../connectivity/plot_cwt_sensor_connectivity.py   |    6 +-
 examples/datasets/plot_spm_faces_dataset.py        |    2 -
 examples/inverse/plot_gamma_map_inverse.py         |    3 -
 examples/inverse/plot_mixed_norm_L21_inverse.py    |    3 -
 .../plot_time_frequency_mixed_norm_inverse.py      |    3 -
 examples/plot_evoked_delayed_ssp.py                |    4 +-
 examples/plot_megsim_data.py                       |    2 -
 examples/plot_shift_evoked.py                      |   11 +-
 examples/plot_ssp_projs_topomaps.py                |   10 +-
 examples/plot_topo_channel_epochs_image.py         |    3 +-
 examples/preprocessing/plot_ica_from_epochs.py     |    1 -
 examples/realtime/plot_compute_rt_average.py       |   21 +-
 examples/stats/plot_sensor_permutation_test.py     |    3 +-
 .../time_frequency/plot_single_trial_spectra.py    |    2 +-
 examples/time_frequency/plot_tfr_topography.py     |    2 +-
 mne/__init__.py                                    |    3 +
 mne/commands/mne_bti2fiff.py                       |    2 +-
 mne/connectivity/spectral.py                       |   15 +-
 mne/coreg.py                                       |    5 +
 mne/cov.py                                         |    2 +-
 mne/fiff/kit/tests/__init__.py                     |    3 +
 mne/fiff/kit/tests/data/test_mrk_post.sqd          |  Bin 0 -> 68824 bytes
 mne/fiff/kit/tests/data/test_mrk_pre.sqd           |  Bin 0 -> 68824 bytes
 mne/fiff/raw.py                                    |    2 +-
 mne/fiff/tests/__init__.py                         |    3 +
 mne/forward/forward.py                             |   13 +-
 mne/forward/tests/test_forward.py                  |    1 +
 mne/forward/tests/test_make_forward.py             |    3 +-
 mne/gui/__init__.py                                |   89 ++
 mne/gui/_coreg_gui.py                              | 1372 ++++++++++++++++++++
 mne/gui/_fiducials_gui.py                          |  462 +++++++
 mne/gui/_file_traits.py                            |  427 ++++++
 mne/gui/_kit2fiff_gui.py                           |  518 ++++++++
 mne/gui/_marker_gui.py                             |  447 +++++++
 mne/gui/_viewer.py                                 |  340 +++++
 mne/{fiff/kit => gui}/tests/__init__.py            |    0
 mne/gui/tests/test_coreg_gui.py                    |  157 +++
 mne/gui/tests/test_fiducials_gui.py                |   68 +
 mne/gui/tests/test_file_traits.py                  |  110 ++
 mne/gui/tests/test_kit2fiff_gui.py                 |   65 +
 mne/gui/tests/test_marker_gui.py                   |   47 +
 mne/layouts/__init__.py                            |    3 +-
 mne/layouts/layout.py                              |  119 +-
 mne/layouts/tests/test_layout.py                   |  105 +-
 mne/minimum_norm/inverse.py                        |    6 +-
 mne/minimum_norm/tests/test_inverse.py             |    4 -
 mne/preprocessing/ica.py                           |    6 +-
 mne/preprocessing/tests/test_ica.py                |    5 +
 mne/source_estimate.py                             |   64 +-
 mne/tests/test_viz.py                              |  171 +--
 mne/utils.py                                       |   35 +
 mne/viz.py                                         |  115 +-
 setup.py                                           |    1 +
 56 files changed, 4613 insertions(+), 291 deletions(-)

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