##// END OF EJS Templates
Merged Gael's ipython-sync-frontend branch with important mods....
Merged Gael's ipython-sync-frontend branch with important mods. This branch showed conflicts with recent changes I made to: IPython.kernel.core.interpreter IPython.kernel.core.tests.test_interpreter I resolved these conflicts and closed a ticket that Gael fixed in his branch. BUT, there is a related ticket that I opened. Furthermore, Gael was using nose in test_interpreter, but we need to keep things in IPython.kernel free of nose!
Brian Granger -
r1949:a093b34b merge
Show More
Name Size Modified Last Commit Author
/ IPython / UserConfig
__init__.py Loading ...
ipy_user_conf.py Loading ...
ipythonrc Loading ...
ipythonrc-math Loading ...
ipythonrc-numeric Loading ...
ipythonrc-physics Loading ...
ipythonrc-pysh Loading ...
ipythonrc-tutorial Loading ...