##// END OF EJS Templates
Merge branch 'htmlnotebook' of github.com:ipython/ipython into htmlnotebook...
Merge branch 'htmlnotebook' of github.com:ipython/ipython into htmlnotebook Conflicts: setupbase.py

File last commit:

r3408:261328d5
r4485:d77eb2c8 merge
Show More
__init__.py
4 lines | 72 B | text/x-python | PythonLexer
Thomas Spura
Unbundle of all external modules....
r3408 try:
from guid import *
except ImportError:
from _guid import *