[med-svn] [python-mne] 165/376: Merge branch 'inverse'

[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 99ab29e003314f30501b7c660f07f458122ef8da
Merge: 758c90b d1c4e60
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Mon Mar 28 16:14:05 2011 -0400

    Merge branch 'inverse'

 examples/plot_compute_mne_inverse.py |  2 +-
 mne/__init__.py                      |  2 +-
 mne/inverse.py                       | 70 +++++++++++++++++++-----------------
 mne/tests/test_inverse.py            |  2 +-
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --cc mne/__init__.py
index 15b462f,124f0d8..d78e642
--- a/mne/__init__.py
+++ b/mne/__init__.py
@@@ -6,8 -6,7 +6,8 @@@ from .forward import read_forward_solut
  from .stc import read_stc, write_stc
  from .bem_surfaces import read_bem_surfaces
  from .source_space import read_source_spaces
- from .inverse import read_inverse_operator, compute_inverse, minimum_norm
+ from .inverse import read_inverse_operator, apply_inverse, minimum_norm
  from .epochs import Epochs
  from .label import label_time_courses, read_label
 +from .misc import parse_config
  import fiff

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