##// END OF EJS Templates
Merging -r 1177 from lp:ipython with fixes and resolutions....
Merging -r 1177 from lp:ipython with fixes and resolutions. The main conflicts I had to fix were in ultratb. I have removed the ultraTB.py in IPython/kernel/core. Now IPython/core/ultratb.py is being used everywhere. Also I have protected the calls to ipapi.get to see if None is returned. This happens when trial IPython.kernel is run.
Brian Granger -
r2124:4a54d9d3 merge
Show More
Name Size Modified Last Commit Author
/ docs / examples / core
example-demo.py Loading ...
example-embed-short.py Loading ...
example-embed.py Loading ...
example-gnuplot.py Loading ...
ipy.vim Loading ...
ipython-sh.desktop Loading ...
ipython.desktop Loading ...
ipython_here_shell_extension.reg Loading ...
leo_bridge_demo.leo Loading ...
seteditor.py Loading ...