##// END OF EJS Templates
Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py....
Merge branch 'master' of git://github.com/ipython/ipython into qtfrontend and fix conflicts in setupbase.py. Conflicts: setupbase.py

File last commit:

r2045:2b04bcfb
r2664:6080a84e merge
Show More
shadowns.py
1 line | 24 B | text/x-python | PythonLexer
""" Shadow namespace """