[med-svn] [python-mne] 123/353: Merge branch 'master' of github.com:mne-tools/mne-python

[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 786ef32ea178f711e695ab53873249c7dbb1d8c5
Merge: 7d2c6a3 a3af68d
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Tue Mar 20 22:25:35 2012 +0100

    Merge branch 'master' of github.com:mne-tools/mne-python

 doc/source/whats_new.rst             |   2 +
 mne/cov.py                           | 106 +++++++++++++++++++++++++----------
 mne/fiff/__init__.py                 |   2 +-
 mne/fiff/proj.py                     |  17 +++++-
 mne/fiff/tests/data/test_raw-eve.fif | Bin 927 -> 927 bytes
 mne/tests/test_cov.py                |  17 +++++-
 6 files changed, 109 insertions(+), 35 deletions(-)


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