[iep] 01/04: Merge branch 'upstream'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository iep.

commit 96981436cc7875581bd146dc8ee895ea27a9a18a
Merge: 3e69b02 a25686b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Feb 18 20:17:34 2015 +0000

    Merge branch 'upstream'

 PKG-INFO                                 |   2 +-
 iep.egg-info/PKG-INFO                    |   2 +-
 iep.egg-info/SOURCES.txt                 |   4 +
 iep.egg-info/entry_points.txt            |   2 +-
 iep/__init__.py                          |  19 ++-
 iep/codeeditor/__init__.py               |  11 +-
 iep/codeeditor/_test.py                  |  44 ++++---
 iep/codeeditor/base.py                   |  74 +++++++----
 iep/codeeditor/extensions/behaviour.py   | 146 ++++++++++++++++++++++
 iep/codeeditor/manager.py                |  12 +-
 iep/iepcore/editor.py                    |  62 ++++++++--
 iep/iepcore/editorTabs.py                |  11 +-
 iep/iepcore/kernelbroker.py              |   4 +-
 iep/iepcore/main.py                      |   4 +-
 iep/iepcore/menu.py                      | 119 ++++++++++++++++++
 iep/iepcore/shell.py                     |  63 ++++++++--
 iep/iepcore/shellInfoDialog.py           |   1 +
 iep/iepcore/shellStack.py                |  14 ++-
 iep/iepkernel/guiintegration.py          |  53 +++++++-
 iep/iepkernel/interpreter.py             |  46 +++++--
 iep/iepkernel/magic.py                   |  52 +++++---
 iep/iepkernel/start.py                   |   4 +
 iep/resources/appicons/ref.ico           | Bin 0 -> 1148 bytes
 iep/resources/appicons/test.ico          | Bin 0 -> 1086 bytes
 iep/resources/defaultConfig.ssdf         |   1 +
 iep/tools/iepFileBrowser/importwizard.py |  14 ++-
 iep/tools/iepFileBrowser/tree.py         |  32 +++--
 iep/tools/iepHistoryViewer.py            | 202 +++++++++++++++++++++++++++++++
 iep/tools/iepWorkspace.py                |  61 +++++++++-
 iep/yoton/channels/channels_file.py      |  31 ++++-
 iep/yoton/core.py                        |  21 ++--
 iep/yoton/misc.py                        |   5 +-
 ieplauncher.py                           |  35 ++++++
 setup.cfg                                |   2 +-
 setup.py                                 |  18 +++
 35 files changed, 1024 insertions(+), 147 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/iep.git