##// END OF EJS Templates
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging...
Merge branch 'kernel-logging' of https://github.com/omazapa/ipython into omazapa-kernel-logging Fixed conflicts arising from updates to using session send instead of directly accessing the sockets. Conflicts: IPython/zmq/iostream.py IPython/zmq/ipkernel.py

File last commit:

r3199:7d03350d
r3322:9d65bd5f merge
Show More
MANIFEST.in
37 lines | 656 B | text/plain | TextLexer
include ipython.py
include setupbase.py
include setupegg.py
graft setupext
graft scripts
graft IPython/kernel
graft IPython/config
graft IPython/core
# graft IPython/deathrow
graft IPython/external
graft IPython/frontend
graft IPython/gui
graft IPython/lib
graft IPython/quarantine
graft IPython/scripts
graft IPython/testing
graft IPython/utils
include IPython/.git_commit_info.ini
graft docs
exclude docs/\#*
exclude docs/man/*.1
# docs subdirs we want to skip
prune docs/attic
prune docs/build
global-exclude *~
global-exclude *.flc
global-exclude *.pyc
global-exclude .dircopy.log
global-exclude .svn
global-exclude .bzr
global-exclude .hgignore