[med-svn] [python-mne] 229/353: Merge pull request #58 from agramfort/tfr_improvement

[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 567538efb4796b61bfc4ad8e995bca148cd6681f
Merge: 2e193c6 46ba514
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Mon Jun 25 06:17:36 2012 -0700

    Merge pull request #58 from agramfort/tfr_improvement
    
    ENH : add support for n_cycles varying with frequency

 .../plot_source_label_time_frequency.py            |  3 +-
 examples/time_frequency/plot_time_frequency.py     |  3 +-
 mne/minimum_norm/time_frequency.py                 |  8 +--
 mne/time_frequency/tests/test_tfr.py               |  3 +-
 mne/time_frequency/tfr.py                          | 62 +++++++++++++---------
 5 files changed, 48 insertions(+), 31 deletions(-)

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