[med-svn] [python-mne] 37/353: Merge branch 'raw_preload_setitem' of github.com:mluessi/mne-python into raw_preload_setitem

[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 9f5576a5a5691569e29e36e1ec9b57f73b9a1f0f
Merge: 58e8c0d bb71018
Author: Martin Luessi <mluessi at nmr.mgh.harvard.edu>
Date:   Tue Jan 3 12:45:50 2012 -0500

    Merge branch 'raw_preload_setitem' of github.com:mluessi/mne-python into raw_preload_setitem
    
    Conflicts:
    	mne/fiff/raw.py

 doc/source/whats_new.rst | 1 +
 mne/fiff/raw.py          | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)


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