##// 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.

File last commit:

r1719:158fe325
r2124:4a54d9d3 merge
Show More
README.txt
11 lines | 281 B | text/plain | TextLexer
==============
IPython README
==============
Overview
========
Welcome to IPython. Our documentation can be found in the docs/source
subdirectory. We also have ``.html`` and ``.pdf`` versions of this
documentation available on the IPython `website <http://ipython.scipy.org>`_.