[med-svn] [python-mne] 48/52: Merge pull request #12 from agramfort/fix

[Yaroslav Halchenko]

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

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

commit 9154cb2f9c7f59deb0315f1ac1b581cca4e1d07b
Merge: 683de5c d8d9caa
Author: Alexandre Gramfort <alexandre.gramfort at m4x.org>
Date:   Tue Nov 8 08:24:37 2011 -0800

    Merge pull request #12 from agramfort/fix
    
    Fix ECG detection and corner cases with morphing and Epochs.average

 mne/artifacts/ecg.py            | 43 ++++++++++++++++++++++++++++-------------
 mne/artifacts/tests/test_ecg.py |  6 +++---
 mne/epochs.py                   | 33 ++++++++++++++++++++-----------
 mne/source_estimate.py          |  2 ++
 4 files changed, 57 insertions(+), 27 deletions(-)

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