[med-svn] [python-mne] 287/353: Merge pull request #67 from joewalter/stim_artifact

[Yaroslav Halchenko]

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

yoh pushed a commit to tag 0.4
in repository python-mne.

commit 111bee4a1e6d93e9059a0b2931a5e35aca659515
Merge: a7c064d 55fb036
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Tue Jul 17 04:01:31 2012 -0700

    Merge pull request #67 from joewalter/stim_artifact
    
    Stim artifact correction

 doc/source/whats_new.rst         |  4 +++
 mne/artifacts/stim.py            | 61 ++++++++++++++++++++++++++++++++++++++++
 mne/artifacts/tests/test_stim.py | 32 +++++++++++++++++++++
 3 files changed, 97 insertions(+)

diff --cc doc/source/whats_new.rst
index 1a6d0aa,3bd7655..1f8d924
--- a/doc/source/whats_new.rst
+++ b/doc/source/whats_new.rst
@@@ -116,3 -116,5 +118,5 @@@ of commits)
  .. _Martin Luessi: http://ivpl.eecs.northwestern.edu/people/mluessi
  
  .. _Yaroslav Halchenko: http://www.onerussian.com/
+ 
 -.. _Daniel Strohmeier: http://www.tu-ilmenau.de/bmti/fachgebiete/biomedizinische-technik/dipl-ing-daniel-strohmeier/
++.. _Daniel Strohmeier: http://www.tu-ilmenau.de/bmti/fachgebiete/biomedizinische-technik/dipl-ing-daniel-strohmeier/

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