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

r680:5a2d2c1b
r1890:c3323314 merge
Show More
ipy_profile_none.py
3 lines | 132 B | text/x-python | PythonLexer
""" Config file for 'default' profile """
# get various stuff that are there for historical / familiarity reasons
import ipy_legacy