##// 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
/ tools
alldeps
check_sources.py Loading ...
compile.py Loading ...
make_tarball.py Loading ...
mkrel.py Loading ...
release Loading ...
run_ipy_in_profiler.py Loading ...
setup_bdist_egg.py Loading ...
testrel Loading ...
testupload Loading ...
update_revnum.py Loading ...