[med-svn] [python-mne] 186/376: Merge branch 'master' of https://github.com/emilyruzich/mne-python
Yaroslav Halchenko
debian at onerussian.com
Fri Nov 27 17:22:34 UTC 2015
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 a56d71d539ca1d9633c60dd6e8290fa9d19f6dd3
Merge: bdbc36a f9ce0df
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date: Wed Apr 6 21:19:49 2011 -0400
Merge branch 'master' of https://github.com/emilyruzich/mne-python
.gitignore | 0
AUTHORS.rst | 0
LICENSE.txt | 0
MANIFEST.in | 0
Makefile | 0
README.rst | 0
doc/Makefile | 0
doc/source/_static/default.css | 0
doc/source/_static/favicon.ico | Bin
doc/source/_static/logo.png | Bin
doc/source/_static/navy.css | 0
doc/source/_templates/layout.html | 0
doc/source/conf.py | 0
doc/source/config_doc.rst | 0
doc/source/getting_started.rst | 0
doc/source/getting_started_at_martinos.rst | 0
doc/source/index.rst | 0
doc/source/manual/AppA.rst | 14 +-
doc/source/manual/AppB.rst | 6 +-
doc/source/manual/AppEULA.rst | 4 +-
doc/source/manual/AppInstall.rst | 10 +-
doc/source/manual/AppReleaseNotes.rst | 202 ++++++++++-----------
doc/source/manual/analyze.rst | 2 +-
doc/source/manual/browse.rst | 38 ++--
doc/source/manual/convert.rst | 0
doc/source/manual/cookbook.rst | 19 +-
doc/source/manual/forward.rst | 59 ++++--
doc/source/manual/intro.rst | 14 +-
doc/source/manual/list.rst | 14 +-
doc/source/manual/matlab.rst | 0
doc/source/manual/mne.rst | 44 ++---
doc/source/manual/mne_analyze/MNE_preferences.png | Bin
doc/source/manual/mne_analyze/adjust_alignment.png | Bin
doc/source/manual/mne_analyze/adjust_lights.png | Bin
doc/source/manual/mne_analyze/adjust_menu.png | Bin
doc/source/manual/mne_analyze/cont_hpi_data.png | Bin
doc/source/manual/mne_analyze/dipole_list.png | Bin
.../manual/mne_analyze/dipole_parameters.png | Bin
doc/source/manual/mne_analyze/dipoles_menu.png | Bin
doc/source/manual/mne_analyze/epoch_selector.png | Bin
.../manual/mne_analyze/field_mapping_pref.png | Bin
doc/source/manual/mne_analyze/file_menu.png | Bin
.../manual/mne_analyze/hardcopy_controls.png | Bin
doc/source/manual/mne_analyze/help_menu.png | Bin
doc/source/manual/mne_analyze/image_dialog.png | Bin
doc/source/manual/mne_analyze/label_list.png | Bin
doc/source/manual/mne_analyze/labels_menu.png | Bin
doc/source/manual/mne_analyze/main_window.png | Bin
doc/source/manual/mne_analyze/movie_dialog.png | Bin
doc/source/manual/mne_analyze/mri_viewer.png | Bin
doc/source/manual/mne_analyze/open_dialog.png | Bin
.../manual/mne_analyze/overlay_management.png | Bin
.../manual/mne_analyze/patch_selection_dialog.png | Bin
.../manual/mne_analyze/save_label_timecourse.png | Bin
doc/source/manual/mne_analyze/scales_dialog.png | Bin
doc/source/manual/mne_analyze/surface_controls.png | Bin
.../mne_analyze/surface_selection_dialog.png | Bin
.../manual/mne_analyze/timecourse_manager.png | Bin
doc/source/manual/mne_analyze/view_menu.png | Bin
doc/source/manual/mne_analyze/viewer.png | Bin
doc/source/manual/mne_analyze/viewer_options.png | Bin
doc/source/manual/mne_analyze/visualize_hpi.png | Bin
doc/source/manual/mne_analyze/windows_menu.png | Bin
doc/source/manual/mne_browse_raw/adjust_menu.png | Bin
doc/source/manual/mne_browse_raw/adust_menu.png | Bin
doc/source/manual/mne_browse_raw/average_pref.png | Bin
.../manual/mne_browse_raw/channel_selection.png | Bin
doc/source/manual/mne_browse_raw/file_menu.png | Bin
doc/source/manual/mne_browse_raw/filter_dialog.png | Bin
doc/source/manual/mne_browse_raw/help_menu.png | Bin
doc/source/manual/mne_browse_raw/main.png | Bin
.../mne_browse_raw/manage_averages_dialog.png | Bin
doc/source/manual/mne_browse_raw/new_selection.png | Bin
doc/source/manual/mne_browse_raw/new_ssp.png | Bin
.../manual/mne_browse_raw/open_dialog copy.png | Bin
doc/source/manual/mne_browse_raw/open_dialog.png | Bin
doc/source/manual/mne_browse_raw/process_menu.png | Bin
doc/source/manual/mne_browse_raw/process_menu2.png | Bin
doc/source/manual/mne_browse_raw/scales_dialog.png | Bin
.../manual/mne_browse_raw/scales_dialog2.png | Bin
doc/source/manual/mne_browse_raw/toolbar.png | Bin
.../manual/mne_browse_raw/windows_menu-0.png | Bin
.../manual/mne_browse_raw/windows_menu-1.png | Bin
.../manual/mne_browse_raw/windows_menu-10.png | Bin
.../manual/mne_browse_raw/windows_menu-11.png | Bin
.../manual/mne_browse_raw/windows_menu-12.png | Bin
.../manual/mne_browse_raw/windows_menu-13.png | Bin
.../manual/mne_browse_raw/windows_menu-14.png | Bin
.../manual/mne_browse_raw/windows_menu-15.png | Bin
.../manual/mne_browse_raw/windows_menu-16.png | Bin
.../manual/mne_browse_raw/windows_menu-17.png | Bin
.../manual/mne_browse_raw/windows_menu-2.png | Bin
.../manual/mne_browse_raw/windows_menu-3.png | Bin
.../manual/mne_browse_raw/windows_menu-4.png | Bin
.../manual/mne_browse_raw/windows_menu-5.png | Bin
.../manual/mne_browse_raw/windows_menu-6.png | Bin
.../manual/mne_browse_raw/windows_menu-7.png | Bin
.../manual/mne_browse_raw/windows_menu-8.png | Bin
.../manual/mne_browse_raw/windows_menu-9.png | Bin
doc/source/manual/mne_browse_raw/windows_menu.png | Bin
doc/source/manual/morph.rst | 0
doc/source/manual/pics/Averaging-flowchart.png | Bin
doc/source/manual/pics/CoordinateSystems.png | Bin
doc/source/manual/pics/Digitizer-example.png | Bin
doc/source/manual/pics/Flowchart.png | Bin
doc/source/manual/pics/HeadCS.png | Bin
doc/source/manual/pics/cover.png | Bin
doc/source/manual/pics/flat.png | Bin
doc/source/manual/pics/morphed.png | Bin
doc/source/manual/pics/neuromag.png | Bin
doc/source/manual/pics/orig.png | Bin
doc/source/manual/pics/proj-off-on.png | Bin
doc/source/manual/pics/title_page.png | Bin
doc/source/manual/reading.rst | 0
doc/source/manual/sampledata.rst | 4 +-
doc/source/manual/utilities.rst | 0
doc/source/mne-python.rst | 0
doc/source/tutorial.rst | 0
doc/sphinxext/README.txt | 0
doc/sphinxext/docscrape.py | 0
doc/sphinxext/docscrape_sphinx.py | 0
doc/sphinxext/gen_rst.py | 0
doc/sphinxext/ipython_console_highlighting.py | 0
doc/sphinxext/numpy_ext/__init__.py | 0
doc/sphinxext/numpy_ext/docscrape.py | 0
doc/sphinxext/numpy_ext/docscrape_sphinx.py | 0
doc/sphinxext/numpy_ext/numpydoc.py | 0
doc/sphinxext/numpy_ext_old/__init__.py | 0
doc/sphinxext/numpy_ext_old/docscrape.py | 0
doc/sphinxext/numpy_ext_old/docscrape_sphinx.py | 0
doc/sphinxext/numpy_ext_old/numpydoc.py | 0
doc/sphinxext/only_directives.py | 0
examples/README.txt | 0
examples/extract_events_from_raw.py | 0
examples/plot_compute_mne_inverse.py | 0
examples/plot_estimate_covariance_matrix.py | 0
examples/plot_from_raw_to_epochs_to_evoked.py | 0
examples/plot_read_and_write_raw_data.py | 0
examples/plot_read_epochs.py | 0
examples/plot_read_evoked.py | 0
examples/plot_read_forward.py | 0
examples/plot_read_noise_covariance_matrix.py | 0
examples/plot_read_source_space.py | 0
examples/plot_read_stc.py | 0
examples/plot_roi_label_activations.py | 0
examples/plot_topography.py | 0
examples/plot_whitened_evoked_data.py | 0
examples/read_bem_surfaces.py | 0
examples/read_events.py | 0
examples/read_inverse.py | 0
examples/stats/README.txt | 0
.../plot_cluster_1samp_test_time_frequency.py | 0
examples/stats/plot_cluster_stats_evoked.py | 0
.../stats/plot_cluster_stats_time_frequency.py | 0
examples/stats/plot_sensor_permutation_test.py | 0
examples/time_frequency/README.txt | 0
examples/time_frequency/plot_time_frequency.py | 0
mne/__init__.py | 0
mne/bem_surfaces.py | 0
mne/cov.py | 0
mne/datasets/__init__.py | 0
mne/datasets/sample/__init__.py | 0
mne/epochs.py | 0
mne/event.py | 0
mne/fiff/__init__.py | 0
mne/fiff/bunch.py | 0
mne/fiff/channels.py | 0
mne/fiff/compensator.py | 0
mne/fiff/constants.py | 0
mne/fiff/ctf.py | 0
mne/fiff/diff.py | 0
mne/fiff/evoked.py | 0
mne/fiff/matrix.py | 0
mne/fiff/meas_info.py | 0
mne/fiff/open.py | 0
mne/fiff/pick.py | 0
mne/fiff/proj.py | 0
mne/fiff/raw.py | 0
mne/fiff/tag.py | 0
mne/fiff/tests/__init__.py | 0
mne/fiff/tests/data/test-ave.fif | Bin
mne/fiff/tests/data/test-cov.fif | Bin
mne/fiff/tests/data/test-eve.fif | Bin
mne/fiff/tests/data/test.ave | 0
mne/fiff/tests/data/test.cov | 0
mne/fiff/tests/data/test_raw-eve.fif | Bin
mne/fiff/tests/data/test_raw.fif | Bin
mne/fiff/tests/test_evoked.py | 0
mne/fiff/tests/test_raw.py | 0
mne/fiff/tree.py | 0
mne/fiff/write.py | 0
mne/forward.py | 0
mne/inverse.py | 0
mne/label.py | 0
mne/layouts/CTF-275.lout | 0
mne/layouts/Vectorview-all.lout | 0
mne/layouts/Vectorview-grad.lout | 0
mne/layouts/Vectorview-mag.lout | 0
mne/layouts/__init__.py | 0
mne/layouts/layout.py | 0
mne/layouts/magnesWH3600.lout | 0
mne/preprocessing.py | 0
mne/source_space.py | 0
mne/stats/__init__.py | 0
mne/stats/cluster_level.py | 0
mne/stats/parametric.py | 0
mne/stats/permutations.py | 0
mne/stats/tests/__init__.py | 0
mne/stats/tests/test_cluster_level.py | 0
mne/stats/tests/test_permutations.py | 0
mne/stc.py | 0
mne/tests/__init__.py | 0
mne/tests/test_bem_surfaces.py | 0
mne/tests/test_cov.py | 0
mne/tests/test_epochs.py | 0
mne/tests/test_event.py | 0
mne/tests/test_forward.py | 0
mne/tests/test_inverse.py | 0
mne/tests/test_label.py | 0
mne/tests/test_source_space.py | 0
mne/tests/test_stc.py | 0
mne/tests/test_viz.py | 0
mne/time_frequency/__init__.py | 0
mne/time_frequency/tests/test_tfr.py | 0
mne/time_frequency/tfr.py | 0
mne/transforms.py | 0
mne/viz.py | 0
setup.cfg | 0
setup.py | 0
229 files changed, 235 insertions(+), 195 deletions(-)
diff --cc examples/plot_compute_mne_inverse.py
index 431f06e,76f9115..431f06e
mode 100644,100755..100755
--- a/examples/plot_compute_mne_inverse.py
+++ b/examples/plot_compute_mne_inverse.py
diff --cc examples/plot_estimate_covariance_matrix.py
index 7f595db,65c62bc..7f595db
mode 100644,100755..100755
--- a/examples/plot_estimate_covariance_matrix.py
+++ b/examples/plot_estimate_covariance_matrix.py
diff --cc examples/plot_from_raw_to_epochs_to_evoked.py
index 5914cfa,6582ed7..5914cfa
mode 100644,100755..100755
--- a/examples/plot_from_raw_to_epochs_to_evoked.py
+++ b/examples/plot_from_raw_to_epochs_to_evoked.py
diff --cc examples/plot_read_epochs.py
index feeed3b,856dc7d..feeed3b
mode 100644,100755..100755
--- a/examples/plot_read_epochs.py
+++ b/examples/plot_read_epochs.py
diff --cc examples/plot_read_evoked.py
index 0680186,7227732..0680186
mode 100644,100755..100755
--- a/examples/plot_read_evoked.py
+++ b/examples/plot_read_evoked.py
diff --cc examples/plot_read_noise_covariance_matrix.py
index 9efd639,8e9b0ab..9efd639
mode 100644,100755..100755
--- a/examples/plot_read_noise_covariance_matrix.py
+++ b/examples/plot_read_noise_covariance_matrix.py
diff --cc examples/plot_whitened_evoked_data.py
index c1e5db4,af01bbc..c1e5db4
mode 100644,100755..100755
--- a/examples/plot_whitened_evoked_data.py
+++ b/examples/plot_whitened_evoked_data.py
diff --cc examples/stats/plot_cluster_1samp_test_time_frequency.py
index 6807948,b562dc8..6807948
mode 100644,100755..100755
--- a/examples/stats/plot_cluster_1samp_test_time_frequency.py
+++ b/examples/stats/plot_cluster_1samp_test_time_frequency.py
diff --cc examples/stats/plot_cluster_stats_evoked.py
index 5ab6d02,e4c5cd4..5ab6d02
mode 100644,100755..100755
--- a/examples/stats/plot_cluster_stats_evoked.py
+++ b/examples/stats/plot_cluster_stats_evoked.py
diff --cc examples/stats/plot_cluster_stats_time_frequency.py
index bf0392d,095bef4..bf0392d
mode 100644,100755..100755
--- a/examples/stats/plot_cluster_stats_time_frequency.py
+++ b/examples/stats/plot_cluster_stats_time_frequency.py
diff --cc examples/stats/plot_sensor_permutation_test.py
index c219469,41969ec..c219469
mode 100644,100755..100755
--- a/examples/stats/plot_sensor_permutation_test.py
+++ b/examples/stats/plot_sensor_permutation_test.py
diff --cc examples/time_frequency/plot_time_frequency.py
index df35773,0333976..df35773
mode 100644,100755..100755
--- a/examples/time_frequency/plot_time_frequency.py
+++ b/examples/time_frequency/plot_time_frequency.py
diff --cc mne/__init__.py
index c471729,a7ecf59..c471729
mode 100644,100755..100755
--- a/mne/__init__.py
+++ b/mne/__init__.py
diff --cc mne/cov.py
index 24d8a8b,7c9ca10..24d8a8b
mode 100644,100755..100755
--- a/mne/cov.py
+++ b/mne/cov.py
diff --cc mne/epochs.py
index 982ca6a,6420f38..982ca6a
mode 100644,100755..100755
--- a/mne/epochs.py
+++ b/mne/epochs.py
diff --cc mne/fiff/__init__.py
index 60aef75,79c481e..60aef75
mode 100644,100755..100755
--- a/mne/fiff/__init__.py
+++ b/mne/fiff/__init__.py
diff --cc mne/fiff/evoked.py
index 9d2871e,46ce122..9d2871e
mode 100644,100755..100755
--- a/mne/fiff/evoked.py
+++ b/mne/fiff/evoked.py
diff --cc mne/fiff/pick.py
index 22a7dc8,894762a..22a7dc8
mode 100644,100755..100755
--- a/mne/fiff/pick.py
+++ b/mne/fiff/pick.py
diff --cc mne/fiff/proj.py
index 5483346,b3b7685..5483346
mode 100644,100755..100755
--- a/mne/fiff/proj.py
+++ b/mne/fiff/proj.py
diff --cc mne/fiff/raw.py
index 4bc609f,33cefc1..4bc609f
mode 100644,100755..100755
--- a/mne/fiff/raw.py
+++ b/mne/fiff/raw.py
diff --cc mne/fiff/tests/data/test-ave.fif
index 67a3db6,0ff74c8..67a3db6
mode 100644,100755..100755
Binary files differ
diff --cc mne/fiff/tests/data/test-cov.fif
index b84054b,1a2da11..b84054b
mode 100644,100755..100755
Binary files differ
diff --cc mne/fiff/tests/data/test.ave
index abc6533,be6ba6a..abc6533
mode 100644,100755..100755
--- a/mne/fiff/tests/data/test.ave
+++ b/mne/fiff/tests/data/test.ave
diff --cc mne/fiff/tests/data/test.cov
index a9d7782,1f9fae2..a9d7782
mode 100644,100755..100755
--- a/mne/fiff/tests/data/test.cov
+++ b/mne/fiff/tests/data/test.cov
diff --cc mne/inverse.py
index 31ad3a6,532fd51..31ad3a6
mode 100644,100755..100755
--- a/mne/inverse.py
+++ b/mne/inverse.py
diff --cc mne/tests/test_cov.py
index a833db8,b25ab50..a833db8
mode 100644,100755..100755
--- a/mne/tests/test_cov.py
+++ b/mne/tests/test_cov.py
diff --cc mne/tests/test_epochs.py
index 325c65c,3760b3f..325c65c
mode 100644,100755..100755
--- a/mne/tests/test_epochs.py
+++ b/mne/tests/test_epochs.py
diff --cc mne/tests/test_inverse.py
index 8589fde,a4a8325..8589fde
mode 100644,100755..100755
--- a/mne/tests/test_inverse.py
+++ b/mne/tests/test_inverse.py
diff --cc mne/time_frequency/tests/test_tfr.py
index d0c5594,145d8fb..d0c5594
mode 100644,100755..100755
--- a/mne/time_frequency/tests/test_tfr.py
+++ b/mne/time_frequency/tests/test_tfr.py
diff --cc mne/time_frequency/tfr.py
index b5b4ee5,1678211..b5b4ee5
mode 100644,100755..100755
--- a/mne/time_frequency/tfr.py
+++ b/mne/time_frequency/tfr.py
diff --cc mne/viz.py
index 7b3bc04,6fbf190..7b3bc04
mode 100644,100755..100755
--- a/mne/viz.py
+++ b/mne/viz.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git
More information about the debian-med-commit
mailing list