##// END OF EJS Templates
Merge commit '37dadeb' (most of PR #4391)...
Merge commit '37dadeb' (most of PR #4391) Conflicts: IPython/testing/iptestcontroller.py
Thomas Kluyver -
r13312:c1912cf4 merge
Show More
Name Size Modified Last Commit Author
/ IPython / parallel / apps
__init__.py Loading ...
baseapp.py Loading ...
ipclusterapp.py Loading ...
ipcontrollerapp.py Loading ...
ipengineapp.py Loading ...
iploggerapp.py Loading ...
launcher.py Loading ...
logwatcher.py Loading ...
win32support.py Loading ...
winhpcjob.py Loading ...