Go to file
Brian Granger 6b0c7134ef Merging -r 1180 from lp:ipthon
No conflicts!
2009-08-03 13:04:27 -07:00
IPython/testing Merging -r 1177 from lp:ipython with fixes and resolutions. 2009-08-03 12:50:56 -07:00
setup.py Merging -r 1180 from lp:ipthon 2009-08-03 13:04:27 -07:00
setupbase.py Merging -r 1180 from lp:ipthon 2009-08-03 13:04:27 -07:00