##// END OF EJS Templates
Merge branch 'takowl-ipy3-preparation' into trunk...
Merge branch 'takowl-ipy3-preparation' into trunk This branch cleans up our trunk to make a 2to3 run be as painless as possible, while keeping our code fully 2.6-compatible. Closes gh-159 (pull request).
Fernando Perez -
r3120:572d3d79 merge
Show More
Name Size Modified Last Commit Author
/ IPython / zmq
gui
pylab
tests
__init__.py Loading ...
blockingkernelmanager.py Loading ...
completer.py Loading ...
displayhook.py Loading ...
entry_point.py Loading ...
frontend.py Loading ...
heartbeat.py Loading ...
iostream.py Loading ...
ipkernel.py Loading ...
kernelmanager.py Loading ...
parentpoller.py Loading ...
pykernel.py Loading ...
session.py Loading ...
zmqshell.py Loading ...