##// END OF EJS Templates
Merging -r 1178 from lp:ipython....
Merging -r 1178 from lp:ipython. No major conflicts.
Brian Granger -
r2125:2a3afbbd merge
Show More
Name Size Modified Last Commit Author
/ docs / examples / kernel
HISTORY.gz Loading ...
asyncmultiengine1.py Loading ...
davinci.txt Loading ...
davinci0.txt Loading ...
davinci1.txt Loading ...
davinci2.txt Loading ...
davinci3.txt Loading ...
fetchparse.py Loading ...
helloworld.py Loading ...
mcdriver.py Loading ...
mcpricer.py Loading ...
multiengine1.ipy Loading ...
multiengine2.ipy Loading ...
multienginemap.py Loading ...
nwmerge.py Loading ...
parallel_pylab.ipy Loading ...
phistogram.py Loading ...
plotting_backend.py Loading ...
plotting_frontend.py Loading ...
pwordfreq.py Loading ...
pwordfreq_skel.py Loading ...
rmt.ipy Loading ...
rmtkernel.py Loading ...
task1.py Loading ...
task2.py Loading ...
task_profiler.py Loading ...
taskmap.py Loading ...
taskreject.py Loading ...
wordfreq.py Loading ...
wordfreq_skel.py Loading ...