[med-svn] [python-mne] 207/376: Merge branch 'master' of github.com:mne-tools/mne-python

[Yaroslav Halchenko]

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

yoh pushed a commit to annotated tag v0.1
in repository python-mne.

commit 18388550a544da2f40b3845f5b40fdd57a20f0d4
Merge: 3fd04c0 70c16aa
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Mon Apr 18 11:06:05 2011 -0400

    Merge branch 'master' of github.com:mne-tools/mne-python

 doc/source/manual/AppA.rst                         |  48 +--
 doc/source/manual/AppB.rst                         |  34 +-
 doc/source/manual/AppInstall.rst                   |  22 +-
 doc/source/manual/analyze.rst                      |  58 ++--
 doc/source/manual/browse.rst                       | 385 ++++++++++-----------
 doc/source/manual/convert.rst                      | 344 +++++++++---------
 doc/source/manual/cookbook.rst                     | 148 ++++----
 doc/source/manual/forward.rst                      | 126 +++----
 doc/source/manual/intro.rst                        |   2 +-
 doc/source/manual/list.rst                         |  12 +-
 doc/source/manual/matlab.rst                       |   4 +-
 doc/source/manual/mne.rst                          | 186 +++++-----
 doc/source/manual/morph.rst                        |  44 +--
 doc/source/manual/sampledata.rst                   |  22 +-
 doc/source/manual/utilities.rst                    | 152 ++++----
 examples/plot_compute_mne_inverse.py               |   4 +-
 examples/plot_from_raw_to_epochs_to_evoked.py      |  12 +-
 examples/plot_minimum_norm_estimate.py             |   4 +-
 examples/plot_read_and_write_raw_data.py           |   8 +-
 examples/plot_read_epochs.py                       |   4 +-
 examples/plot_read_evoked.py                       |   2 +-
 examples/plot_read_forward.py                      |   8 +-
 examples/plot_read_source_space.py                 |   9 +-
 examples/plot_read_stc.py                          |   2 +-
 examples/plot_whitened_evoked_data.py              |  10 +-
 examples/read_bem_surfaces.py                      |   8 +-
 examples/read_inverse.py                           |   6 +-
 .../plot_cluster_1samp_test_time_frequency.py      |  31 +-
 examples/stats/plot_cluster_stats_evoked.py        |  12 +-
 .../stats/plot_cluster_stats_time_frequency.py     |  28 +-
 examples/stats/plot_sensor_permutation_test.py     |   4 +-
 examples/time_frequency/plot_time_frequency.py     |  22 +-
 mne/bem_surfaces.py                                |  85 ++---
 mne/cov.py                                         |  30 +-
 mne/epochs.py                                      |  20 +-
 mne/event.py                                       |  11 +-
 mne/fiff/__init__.py                               |   1 -
 mne/fiff/bunch.py                                  |   2 +-
 mne/fiff/channels.py                               |   3 +-
 mne/fiff/compensator.py                            |  52 +--
 mne/fiff/constants.py                              |  94 ++---
 mne/fiff/ctf.py                                    |  21 +-
 mne/fiff/diff.py                                   |   4 +-
 mne/fiff/evoked.py                                 |  42 ++-
 mne/fiff/matrix.py                                 |  22 +-
 mne/fiff/meas_info.py                              |  84 ++---
 mne/fiff/open.py                                   |  11 +-
 mne/fiff/pick.py                                   |  10 +-
 mne/fiff/proj.py                                   |  59 ++--
 mne/fiff/raw.py                                    |  37 +-
 mne/fiff/tag.py                                    | 101 +++---
 mne/fiff/tests/test_evoked.py                      |  12 +-
 mne/fiff/tree.py                                   |  18 +-
 mne/fiff/write.py                                  |  15 +-
 mne/forward.py                                     | 131 +++----
 mne/inverse.py                                     |  74 ++--
 mne/label.py                                       |   2 +-
 mne/layouts/__init__.py                            |   2 +-
 mne/layouts/layout.py                              |  16 +-
 mne/misc.py                                        |  18 +-
 mne/preprocessing.py                               |  25 +-
 mne/source_space.py                                |  56 ++-
 mne/stats/__init__.py                              |   3 +-
 mne/stats/cluster_level.py                         |  59 ++--
 mne/stats/parametric.py                            |  12 +-
 mne/stats/permutations.py                          |  21 +-
 mne/stc.py                                         |  14 +-
 mne/tests/test_bem_surfaces.py                     |   1 +
 mne/tests/test_inverse.py                          |   6 +-
 mne/tests/test_label.py                            |   1 +
 mne/tests/test_source_space.py                     |  16 +-
 mne/tests/test_viz.py                              |   2 -
 mne/time_frequency/tfr.py                          |  35 +-
 mne/transforms.py                                  |  63 ++--
 mne/viz.py                                         |   8 +-
 75 files changed, 1545 insertions(+), 1515 deletions(-)


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