[med-svn] [python-mne] 199/353: merge conflict resolved

[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 b5a724bc717d61c026f70225d3aa61e6175b83bb
Merge: 7c57b93 a1ed363
Author: mluessi at nmr.mgh.harvard.edu <mluessi at nmr.mgh.harvard.edu>
Date:   Mon Jun 18 02:07:08 2012 -0400

    merge conflict resolved

 doc/source/whats_new.rst                           |  2 +
 .../plot_estimate_covariance_matrix_baseline.py    | 55 ++++++++++++++++++++++
 ...x.py => plot_estimate_covariance_matrix_raw.py} |  0
 mne/cov.py                                         | 16 ++++++-
 mne/tests/test_cov.py                              | 30 +++++++-----
 5 files changed, 89 insertions(+), 14 deletions(-)

diff --cc doc/source/whats_new.rst
index b1c37bb,0beaf5f..cbd5512
--- a/doc/source/whats_new.rst
+++ b/doc/source/whats_new.rst
@@@ -7,8 -9,8 +7,10 @@@ Curren
  Changelog
  ~~~~~~~~~
  
 +   - Add Raw.filter method to more easily band pass data by `Alex Gramfort`_.
 +
+    - Add tmin + tmax parameters in mne.compute_covariance to estimate noise covariance in epochs baseline without creating new epochs by `Alex Gramfort`_.
+ 
     - Add method to regularize a noise covariance by `Alex Gramfort`_.
  
     - Read and write measurement info in forward and inverse operators for interactive visualization in mne_analyze by `Alex Gramfort`_.

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