##// 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.
Brian Granger -
r1890:c3323314 merge
Show More
Name Size Modified Last Commit Author
IPython
debian
docs
sandbox
scripts
setupext
test
tools
.bzrignore Loading ...
.checkeol Loading ...
.hgignore Loading ...
COPYING.txt Loading ...
MANIFEST.in Loading ...
README.txt Loading ...
ipykit.py Loading ...
ipython.py Loading ...
setup.py Loading ...
setup_bdist_egg.py Loading ...
setupbase.py Loading ...
setupegg.py Loading ...
setupexe.py Loading ...

==============
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>`_.