You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Brian Granger e10677aaff Merging upstream changes from inputhook branch. ... These changes are being propagated from trunk->module-reorg->inputhook to me.		17 years ago
IPython/testing	Merging upstream change from module-reorg branch.	17 years ago
setup.py	Merging -r 1180 from lp:ipthon	17 years ago
setupbase.py	Merging -r 1192 from lp:ipython.	17 years ago