[med-svn] [python-mne] 359/376: Merge branch 'master' into label_tfr

[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 4c0e1a94fc0c603612c0d3e1439c0ed664585537
Merge: 11d22fd e7d0874
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Fri Sep 16 16:53:49 2011 -0400

    Merge branch 'master' into label_tfr
    
    Conflicts:
    	mne/minimum_norm/__init__.py

 doc/source/getting_started.rst        | 24 ++------------
 examples/inverse/plot_morph_data.py   |  6 ++--
 examples/plot_whitened_evoked_data.py | 61 -----------------------------------
 mne/minimum_norm/__init__.py          |  3 +-
 mne/tests/test_source_estimate.py     |  3 +-
 mne/tests/test_source_space.py        |  2 +-
 6 files changed, 9 insertions(+), 90 deletions(-)

diff --cc mne/minimum_norm/__init__.py
index e9dbf7e,6a22998..3ee45ec
--- a/mne/minimum_norm/__init__.py
+++ b/mne/minimum_norm/__init__.py
@@@ -1,3 -1,4 +1,4 @@@
  from .inverse import read_inverse_operator, apply_inverse, \
-                      apply_inverse_raw, make_inverse_operator
+                      apply_inverse_raw, make_inverse_operator, \
+                      apply_inverse_epochs
 -from .time_frequency import source_induced_power
 +from .time_frequency import source_band_induced_power, source_induced_power

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