##// END OF EJS Templates
Merge branch 'master' into kernelmanager...
Merge branch 'master' into kernelmanager Conflicts: IPython/utils/traitlets.py
Brian Granger -
r2752:5016a14f merge
Show More
Name Size Modified Last Commit Author
/ docs / examples / core
demo-exercizer.py Loading ...
example-demo.py Loading ...
example-embed-short.py Loading ...
example-embed.py Loading ...
example-gnuplot.py Loading ...
ipy.vim Loading ...
ipython-sh.desktop Loading ...
ipython.desktop Loading ...
ipython_here_shell_extension.reg Loading ...
leo_bridge_demo.leo Loading ...
new-embed.py Loading ...
seteditor.py Loading ...