##// END OF EJS Templates
Merging -r 1181 from lp:ipython....
Merging -r 1181 from lp:ipython. A few changes were made to resolve conflicts: * clipboard.py moved to core. * Imports fixed.

File last commit:

r1877:d11df54f
r2128:edd2e623 merge
Show More
.bzrignore
4 lines | 110 B | text/plain | TextLexer
# IPython-specific files and pattersn that bzr should ignore
docs/dist
docs/build/*
docs/source/api/generated