[med-svn] [python-mne] 72/376: Merge branch 'tfr'

[Yaroslav Halchenko]

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

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

commit 982d5dc30142c5b07721c3a32ab4c45655bef2da
Merge: dc7864b 82eb385
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Mon Feb 14 09:43:02 2011 -0500

    Merge branch 'tfr'

 examples/plot_time_frequency.py |  85 +++++++++++++++++
 mne/__init__.py                 |   1 +
 mne/tfr.py                      | 204 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 290 insertions(+)

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