##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

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.
vivainio - - Load All Authors

File last commit:

r736:d53b34f4
r2124:4a54d9d3 merge
Show More
.hgignore
18 lines | 161 B | text/plain | TextLexer
/ .hgignore
History | Annotation | Raw |Copy content |Copy permalink
syntax: glob
*~
*.tmp
*.pyc
*.bak
*.tgz
*.org
*.rej
.svn/
.bzr/
.settings/
.project
*.diff
IPython_crash_report.txt
syntax: regexp
.*\#.*\#$