_images/cosmomvpa_banner.png

A multi-modal, multi-variate pattern analysis (MVPA) toolbox in Matlab / GNU Octave for cognitive neuroscientists.

CoSMoMVPA

  • State-of-the art, yet simple to use MVPA implementations.
  • Runs on the Matlab and GNU Octave platform, on MS Windows, OSX, and GNU/Linux.
  • Handles fMRI volumetric, fMRI surface-based, and MEEG data through a uniform data structure.
  • Support for a wide range of data formats.
  • Searchlights in the volume, on the surface, over sensors, time bins, and frequency bands.
  • Multiple-comparison correction using Threshold-Free Cluster Enhancement Monte Carlo simulations.
  • Extensive documentation, including a variety of runnable scripts and implementation exercises (with solutions).
  • Is Free/Open Source Software (MIT License), see http://github.com/CoSMoMVPA/CoSMoMVPA.
_images/icon_demos.png _images/icon_philosophy.png _images/icon_get_started.png _images/icon_download.png _images/icon_modules.png _images/icon_documentation.png _images/icon_exercises.png _images/icon_tips.png _images/icon_faq.png _images/icon_contact.png _images/icon_develop.png _images/icon_thanks.png

News

  • our CoSMoMVPA manuscript has been published ([OCH16]): Oosterhof, N. N., Connolly, A. C., and Haxby, J. V. (2016). CoSMoMVPA: multi-modal multivariate pattern analysis of neuroimaging data in Matlab / GNU Octave. Frontiers in Neuroinformatics, doi:10.3389/fninf.2016.00027.

Changes since last month

Summary

  [BF]    3 bug fixes
 [CLN]    2 clean-ups
 [DOC]    3 code documentation changes
 [ENH]    7 enhancements
  [NF]    8 new features
[OCTV]    5 Octave-compatibility improvements
  [RF]    8 refactorings
 [SML]    2 minor changes
 [TST]   15 unit or doctest changes
 [WEB]    1 website documentation changes

Acknowledgements

- Maria Montchal
- Tijl Grootswagers
- Raffaele Tucciarelli
- Daria Proklova

Bug fixes

commit 15384af36fab25039e19a554b6dd36a71d74233d
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 29 11:41:29 2016 +0200

    OCTV+BF+ACK: always use {X,Y}Tick when using {X,Y}TickLabel when
        producing plots, as otherwise Octave may show a wrong label
        order. Thanks to #Maria Montchal# for reporting the issue

 doc/source/thanks.rst                  | 1 +
 examples/demo_fmri_distatis.m          | 5 +++--
 examples/demo_fmri_rois.m              | 5 +++--
 examples/run_classify_lda.m            | 4 ++--
 examples/run_crossvalidation_measure.m | 5 +++--
 examples/run_nfold_crossvalidate.m     | 6 +++---
 6 files changed, 15 insertions(+), 11 deletions(-)

commit 368462d29ac65386219923c1981a0772f9869460
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 6 14:59:49 2016 +0200

    BF: properly deal with case of all elements selected

 mvpa/cosmo_map_pca.m |  4 ++--
 tests/test_map_pca.m | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

All changes

commit 3e2d00be2cb82817a6ab1607fd44caa8c7874991
Merge: afb6886 68728d0
Author: Nikolaas N. Oosterhof <n.n.oosterhof@googlemail.com>
Date:   Thu Sep 29 13:09:34 2016 +0200

    Merge pull request #90 from nno/eeglab/study_data_io          NF:
        EEGLAB study data io

commit afb6886120d3edba41bd75658de3d76458c5ebb4
Merge: 5a66060 15384af
Author: Nikolaas N. Oosterhof <n.n.oosterhof@googlemail.com>
Date:   Thu Sep 29 13:08:41 2016 +0200

    Merge pull request #92 from nno/_msc/examples_xticklabel_use_xtick
        OCTV+BF+ACK: always use {X,Y}Tick when using {X,Y}TickLabel

commit 5a66060b7e5d8be8816cff5f86c77396ab433ee7
Merge: 8e551d2 80e7f16
Author: Nikolaas N. Oosterhof <n.n.oosterhof@googlemail.com>
Date:   Thu Sep 29 13:08:30 2016 +0200

    Merge pull request #91 from nno/_tst/simplify_run_sequentially
        TST: simplify running commands sequentially in cleanup after
        test

commit 15384af36fab25039e19a554b6dd36a71d74233d
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 29 11:41:29 2016 +0200

    OCTV+BF+ACK: always use {X,Y}Tick when using {X,Y}TickLabel when
        producing plots, as otherwise Octave may show a wrong label
        order. Thanks to #Maria Montchal# for reporting the issue

 doc/source/thanks.rst                  | 1 +
 examples/demo_fmri_distatis.m          | 5 +++--
 examples/demo_fmri_rois.m              | 5 +++--
 examples/run_classify_lda.m            | 4 ++--
 examples/run_crossvalidation_measure.m | 5 +++--
 examples/run_nfold_crossvalidate.m     | 6 +++---
 6 files changed, 15 insertions(+), 11 deletions(-)

commit 80e7f16186d22fef2972e33e7968e3a80ac50dea
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 29 11:31:00 2016 +0200

    TST: simplify running commands sequentially in cleanup after test

 tests/test_run_tests.m | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

commit 68728d0bc6a138f5d74b2ecd868b155290c4e287
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Sep 28 14:44:03 2016 +0200

    NF+TST: support for EEGLAB structures

 mvpa/cosmo_map2meeg.m     | 157 ++++++++++++++++++++++++++++++++-----
 mvpa/cosmo_meeg_dataset.m | 154 ++++++++++++++++++++++++++++++++++---
 tests/test_meeg_io.m      | 191 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 467 insertions(+), 35 deletions(-)

commit 10ba1a918355450ca0ea844feb7b9f6bf0fa9662
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Sep 28 10:43:45 2016 +0200

    RF: more modular approach to multiple file formats

 mvpa/cosmo_map2meeg.m | 56 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 11 deletions(-)

commit 8e551d278132532d7c11517e5e9df58ac75d13f1
Merge: e1804f1 e1ad052
Author: Nikolaas N. Oosterhof <n.n.oosterhof@googlemail.com>
Date:   Tue Sep 20 19:02:57 2016 +0200

    Merge pull request #89 from nno/_eeg/unknown_channels
        ENH: support EEG layouts with unknown channels

commit e1ad052dd2d71175be1cbde1c9ceef17c2fd8dbf
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 20 18:07:25 2016 +0200

    TST: verify presence of FieldTrip

 tests/test_cluster_neighborhood.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit a0d623dbac454fca9adf952703c3d84279e5445b
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 20 17:46:41 2016 +0200

    ENH: support EEG layouts with unknown channels

 mvpa/cosmo_meeg_chan_neighbors.m  |  8 ++++++--
 tests/test_cluster_neighborhood.m | 31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

commit e1804f104aa4920c1d2e31437e66604afa4aff4f
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 20 13:48:30 2016 +0200

    TST+OCTV: do not show deprecation warning

 tests/test_isequaln.m | 1 +
 1 file changed, 1 insertion(+)

commit ca07d318035f98d9d5d001082df3fab3c8a3c73b
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 20 13:44:11 2016 +0200

    TST: use proper conditional to skip test

 tests/test_run_tests.m | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

commit 7fdbaf2d6b2dd2bf5adda4ee640c0e8c952aa952
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 20 13:40:08 2016 +0200

    TST: add missing parenthesis

 tests/test_run_tests.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit feccbdcb276fcd879592b520709365e98fbc87b2
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 20 11:46:29 2016 +0200

    NF: support single argument

 mvpa/cosmo_dir.m | 11 ++++++++---
 tests/test_dir.m |  7 +++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

commit 569f97cf60f7c232cf368580c8bb9c74092961b9
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 19 13:37:04 2016 +0200

    RF+OCTV+MSC: update code to skip tests for any version of Octave
        "io" package of version 2.4.2 or later

 tests/test_run_tests.m | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

commit 7ec3984939effa44e53984ca1e568ba8e120b702
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 19 12:58:39 2016 +0200

    TST: put functions in cell

 tests/test_run_tests.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit df6411e2119f34b5a00034cfb50d5a732fea32d7
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 19 11:54:45 2016 +0200

    RF: move to seperate function

 tests/test_run_tests.m | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 3bb10661421650677292e74476db14b1fbea0a0a
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 19 11:14:24 2016 +0200

    RF: simplify code

 mvpa/cosmo_dim_prune.m | 5 -----
 tests/test_dim_prune.m | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

commit d91f14675dbd1ab15c6983c38ce078b5936385ef
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 19 10:53:25 2016 +0200

    CLN: indent

 mvpa/cosmo_dim_prune.m | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

commit 20790abf8421e0cf1c1992f6b904428067634aae
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 19 10:53:03 2016 +0200

    CLN: remote unused statement

 tests/test_dim_prune.m | 1 -
 1 file changed, 1 deletion(-)

commit 1d586aed6aa7c95211b1c6b305b776ebf373b2eb
Merge: b31740a 3003874
Author: Nikolaas N. Oosterhof <n.n.oosterhof@googlemail.com>
Date:   Sat Sep 10 14:26:25 2016 +0200

    Merge pull request #86 from nno/pca_octave          NF: PCA
        functionality compatible with GNU Octave

commit 3003874685b53bc2594b9ad2ed72f4381a08ec88
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Sat Sep 10 12:53:31 2016 +0200

    ACK: list #Tijl Grootswagers# as contributor

 AUTHOR | 1 +
 1 file changed, 1 insertion(+)

commit 0d90b411ca9b4845a38638efb8f87aaaa9eb139d
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Sat Sep 10 12:51:25 2016 +0200

    NF: protect against large number of features in PCA

 mvpa/cosmo_map_pca.m | 30 +++++++++++++++++++++++++-----
 tests/test_map_pca.m | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)

commit e2647a7cc7b297649d5ba9b9306f94fdc0590ce9
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Sat Sep 10 12:43:55 2016 +0200

    DOC: increase indent and show parameters as key/value pairs

 mvpa/cosmo_map_pca.m | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

commit b31740a55dd910bf2bf4d73194a5f98b0e562f72
Merge: 13924ae dfd424a
Author: Nikolaas N. Oosterhof <n.n.oosterhof@googlemail.com>
Date:   Thu Sep 8 17:50:24 2016 +0200

    Merge pull request #88 from nno/_nf/masked_rsa_matrix          NF:
        support for masked target RSA matrix

commit dfd424aeec93ceaee53e172ae9beccc5e3f43a05
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 8 16:23:50 2016 +0200

    NF: support for target RSA matrices with certain positions masked
        out

 mvpa/cosmo_target_dsm_corr_measure.m | 106 +++++++++++++++++++----
 tests/test_target_dsm_corr_measure.m | 160 +++++++++++++++++++++++++++++------
 2 files changed, 225 insertions(+), 41 deletions(-)

commit f30d45f9c620c690c6782e104342c5ce674d965b
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 8 15:58:35 2016 +0200

    ENH: support distance matrices with NaN

 mvpa/cosmo_squareform.m |  2 +-
 tests/test_squareform.m | 57 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 52 insertions(+), 7 deletions(-)

commit b039c086700807dea2c06c75c723bef074b1dafe
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 8 13:32:04 2016 +0200

    RF: more variable renamings

 mvpa/cosmo_target_dsm_corr_measure.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 08b64a8a7962fac8b858b8e3fc7d5d5413b21ee7
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 8 13:30:38 2016 +0200

    RF: rename variable

 mvpa/cosmo_target_dsm_corr_measure.m | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

commit e9f754296475eeedded694bd8adce61cb63484a8
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 8 11:16:30 2016 +0200

    TST+OCTV: do not use zscore as Octave has different syntax than
        matlab

 tests/test_target_dsm_corr_measure.m | 1 -
 1 file changed, 1 deletion(-)

commit 34d72cd144393b3d6a561791dc5877778d45a16a
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 8 11:06:49 2016 +0200

    TST: add test for glm matrices

 tests/test_target_dsm_corr_measure.m | 51 +++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 16 deletions(-)

commit 13924aec304af40769c2dbe33dce7d58e326b000
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Sep 7 13:22:36 2016 +0200

    WEB+ACK: add entry about clustering over time. Thanks to #Daria
        Proklova# for asking this question

 doc/source/faq.rst | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

commit b1fb786df3ba082f0a15c487263ebd1a64f6b9d1
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 6 17:08:08 2016 +0200

    MSC: update reference

 mvpa/cosmo_check_external.m | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit bd3fa4773ec2de61410878546c8bc5525c1e66cf
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 6 15:00:09 2016 +0200

    TST: do not run test for zero count

 tests/test_map_pca.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 368462d29ac65386219923c1981a0772f9869460
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 6 14:59:49 2016 +0200

    BF: properly deal with case of all elements selected

 mvpa/cosmo_map_pca.m |  4 ++--
 tests/test_map_pca.m | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

commit ec88e0bab1e4d8e9a2f3c91689dd59550151d68e
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Tue Sep 6 11:50:59 2016 +0200

    DOC+ACK: update documentation to reflect that normalization is
        always along the first dimension. Thanks to #Raffaele
        Tucciarelli# for pointing out the discrepancy between
        documentation and implementation

 mvpa/cosmo_crossvalidate.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 112fb4fb852b0245c695b90b5cecf6183b9a5ec3
Merge: 3f2b9c2 ee6225c
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 5 15:39:13 2016 +0200

    Merge branch 'master' into pca_octave

commit 3f2b9c2da1be3e71a08fd23ff1d6b97bd8530661
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 5 15:26:23 2016 +0200

    DOC: explain test

 tests/test_crossvalidation_measure.m | 1 +
 1 file changed, 1 insertion(+)

commit fd49786f93b7c762c5ee8e0e67091dad40bc70ca
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 5 15:25:49 2016 +0200

    TST: always use balanced partitions

 tests/test_crossvalidation_measure.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b857183def3b21aeb4f157d963b544a6c0af48fb
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 5 14:34:49 2016 +0200

    TST: add test for crossvalidation with PCA

 mvpa/cosmo_crossvalidate.m           |  4 +-
 tests/test_crossvalidation_measure.m | 92 ++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)

commit a05718498bb28de5b5ba744f717b127cde1daf65
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 5 13:52:11 2016 +0200

    ENH: properly select number of components and deal with mchine
        precision issues

 mvpa/cosmo_map_pca.m | 26 +++++++++++++++++---------
 mvpa/cosmo_pca.m     |  4 +---
 tests/test_map_pca.m | 12 +++++++++---
 3 files changed, 27 insertions(+), 15 deletions(-)

commit 93c4cbb5c5e32d0d1a3a99b4929bfe53fe9f655b
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Mon Sep 5 09:54:40 2016 +0200

    RF+TST+ENH: add test and refactor map_pca

 mvpa/cosmo_map_pca.m | 139 ++++++++++++++++++++----------
 mvpa/cosmo_pca.m     |   2 +-
 tests/test_map_pca.m | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 328 insertions(+), 45 deletions(-)

commit 5a044d20d52e99a7cc2e7a13f7e0a92a54fc1a58
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Sun Sep 4 16:32:11 2016 +0200

    RF: return row vector for exaplained variance

 mvpa/cosmo_pca.m | 73 ++------------------------------------------------------
 tests/test_pca.m | 70 +++++++----------------------------------------------
 2 files changed, 11 insertions(+), 132 deletions(-)

commit 0fb17a60730d781ba9e0a43362c765e00a4f81ab
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Fri Sep 2 15:51:17 2016 +0200

    ENH: do not store explained ratio or count

 mvpa/cosmo_map_pca.m | 2 --
 1 file changed, 2 deletions(-)

commit 1ca78759cae3a0536f0d318885fb33793c26e18f
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Fri Sep 2 14:58:09 2016 +0200

    SML: remove trailing whitespace

 mvpa/cosmo_map_pca.m | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit cd5452036e152a834124cafc7f677591fae87f92
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 1 15:37:12 2016 +0200

    NF: principal component analysis

 mvpa/cosmo_pca.m | 223 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/test_pca.m | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 487 insertions(+)

commit 547ed633303e7fe29496c5732fada62566c7ab98
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Thu Sep 1 15:36:33 2016 +0200

    SML: remove trailing whitespace

 mvpa/cosmo_crossvalidate.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f83544a7d15eeb56fc49a7dd075e25da0fa7729c
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Aug 31 15:47:25 2016 +0200

    MSC: rename cosmo_pca -> cosmo_map_pca

 mvpa/cosmo_map_pca.m | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++
 mvpa/cosmo_pca.m     | 107 ---------------------------------------------------
 2 files changed, 107 insertions(+), 107 deletions(-)

commit ee6225cb0ecf9e71491750c9d7352fd2136fae2a
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Aug 31 13:16:12 2016 +0200

    TST: include newline character

 tests/test_meeg_read_layout.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cc42953f9ab5390ca6e00affac5cb004f9e272e3
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Aug 31 13:16:01 2016 +0200

    ENH: use onCleanup

 mvpa/cosmo_meeg_read_layout.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 03b1c888e7abea0974e6e90a1c19639ee0686bc1
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Aug 31 11:57:50 2016 +0200

    MSC: add license terms note

 mvpa/cosmo_meeg_read_layout.m | 4 ++++
 1 file changed, 4 insertions(+)

commit bcdcc0af2f6edb8d75d32029e4ad7034e80af2d4
Merge: a5c9045 e262a6e
Author: Nikolaas N. Oosterhof <nikolaas.oosterhof@unitn.it>
Date:   Wed Aug 31 10:22:31 2016 +0200

    Merge branch 'master' into Tijl-pca

Indices and tables