##// END OF EJS Templates
Merge branch 'takowl-ipy3-preparation' into trunk...
Merge branch 'takowl-ipy3-preparation' into trunk This branch cleans up our trunk to make a 2to3 run be as painless as possible, while keeping our code fully 2.6-compatible. Closes gh-159 (pull request).

File last commit:

r3111:3fd347a5
r3120:572d3d79 merge
Show More
.gitignore
8 lines | 84 B | text/plain | TextLexer
docs/dist
docs/build/*
docs/source/api/generated
*.pyc
build
*.egg-info
*.py~
*.bak