##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.
Brian Granger -
r1890:c3323314 merge
Show More
Name Size Modified Last Commit Author
/ IPython / kernel
config
core
scripts
tests
__init__.py Loading ...
asyncclient.py Loading ...
client.py Loading ...
clientconnector.py Loading ...
clientinterfaces.py Loading ...
codeutil.py Loading ...
contexts.py Loading ...
controllerservice.py Loading ...
engineconnector.py Loading ...
enginefc.py Loading ...
engineservice.py Loading ...
error.py Loading ...
fcutil.py Loading ...
magic.py Loading ...
map.py Loading ...
mapper.py Loading ...
multiengine.py Loading ...
multiengineclient.py Loading ...
multienginefc.py Loading ...
newserialized.py Loading ...
parallelfunction.py Loading ...
pbconfig.py Loading ...
pbutil.py Loading ...
pendingdeferred.py Loading ...
pickleutil.py Loading ...
task.py Loading ...
taskclient.py Loading ...
taskfc.py Loading ...
twistedutil.py Loading ...
util.py Loading ...