[med-svn] [python-mne] 52/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 369e43a9efb85d2725b61c10f2781aeeca38f980
Merge: 4b8d486 89fd09f
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Fri Jan 6 19:13:02 2012 +0100

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

 examples/read_events.py  |  5 ++++-
 mne/__init__.py          |  3 ++-
 mne/epochs.py            | 22 ++++++++++---------
 mne/event.py             | 55 ++++++++++++++++++++++++++++++++++++++++++++++--
 mne/tests/test_epochs.py |  7 +++++-
 mne/tests/test_event.py  | 10 ++++++++-
 6 files changed, 86 insertions(+), 16 deletions(-)


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