[med-svn] [python-mne] 263/376: Merge branch 'master' of https://github.com/emilyruzich/mne-python

[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 f9f03d56547072d98b55a11a3e186688984afbe3
Merge: 46c6144 de57d29
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Wed May 25 11:43:03 2011 -0400

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

 doc/source/manual/AppB.rst      |  12 ++--
 doc/source/manual/convert.rst   |  92 ++++++++++++------------
 doc/source/manual/matlab.rst    |  12 ++--
 doc/source/manual/mne.rst       |   6 +-
 doc/source/manual/morph.rst     |  62 ++++++++---------
 doc/source/manual/utilities.rst | 151 ++++++++++++++++++++--------------------
 6 files changed, 167 insertions(+), 168 deletions(-)

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