This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main
ipython branch. This is not a true merge in the formal sense because all history is not coming
over with the files. For a detailed history of the added files, please see the ipython1-dev
branch or the svn repository on scipy.org that ipython1-dev came from.
More specifically, here is what I have done in this commit:
1) Moved the following by hand
ipython1.config -> IPython.config
ipython1.kernel -> IPython.kernel
ipython1.external -> IPython.external
ipython1.core -> IPython.kernel.core
ipython1.testutils -> IPython.testing
ipython1.tools -> IPython.tools
2) Moved IPython.tools.guid -> IPython1.external.guid
3) Renamed:
ipython1 -> IPython
IPython.core -> IPython.kernel.core
IPython.testutils -> IPython.testing
4) Then did a "bzr add" for all the new stuff.
That is all folks!
