##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.

File last commit:

r1719:158fe325
r1890:c3323314 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>`_.