##// 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 / lib
gui-gtk.py Loading ...
gui-mpl.py Loading ...
gui-qt.py Loading ...
gui-tk.py Loading ...
gui-wx.py Loading ...