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

r1420:34bafc01
r2664:6080a84e merge
Show More
simplevars.py
2 lines | 22 B | text/x-python | PythonLexer
x = 1
print 'x is:',x