##// 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.

File last commit:

r1727:49b3ff8f
r1890:c3323314 merge
Show More
MANIFEST.in
32 lines | 522 B | text/plain | TextLexer
include ipython.py
include setupbase.py
include setupegg.py
graft scripts
graft setupext
graft IPython/UserConfig
graft IPython/kernel
graft IPython/config
graft IPython/testing
graft IPython/tools
recursive-include IPython/Extensions igrid_help*
graft docs
exclude docs/\#*
exclude docs/man/*.1
# docs subdirs we want to skip
prune docs/attic
prune docs/build
global-exclude *~
global-exclude *.flc
global-exclude *.pyc
global-exclude .dircopy.log
global-exclude .svn
global-exclude .bzr
global-exclude .hgignore