[med-svn] [python-mne] 07/15: Merge tag 'upstream/0.13+git5-g028f2ee'

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to branch master
in repository python-mne.

commit b8d73d0def44ad31360b7fdd245ba06e204d4d25
Merge: 62dfc4c 0d54c51
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Tue Oct 11 14:59:15 2016 -0400

    Merge tag 'upstream/0.13+git5-g028f2ee'
    
    Upstream version 0.13+git5-g028f2ee
    
    * tag 'upstream/0.13+git5-g028f2ee':
      New upstream version 0.13+git5-g028f2ee

 circle.yml                                                |  6 +++++-
 examples/datasets/plot_megsim_data_single_trial.py        |  4 ++--
 examples/datasets/plot_spm_faces_dataset.py               |  9 ++++-----
 examples/decoding/plot_decoding_spatio_temporal_source.py |  2 +-
 examples/inverse/plot_compute_mne_inverse_raw_in_label.py |  1 +
 examples/realtime/ftclient_rt_average.py                  |  2 +-
 examples/realtime/plot_compute_rt_average.py              |  2 +-
 mne/decoding/tests/test_time_gen.py                       |  6 +++---
 mne/html/bootstrap.min.js                                 |  7 +++++++
 mne/html/d3.v3.min.js                                     |  5 +++++
 mne/html/jquery-1.10.2.min.js                             |  6 ++++++
 mne/html/jquery-ui.min.js                                 | 12 ++++++++++++
 mne/html/mpld3.v0.2.min.js                                |  2 ++
 mne/viz/evoked.py                                         |  3 ++-
 14 files changed, 52 insertions(+), 15 deletions(-)

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