##// END OF EJS Templates
Commit Message Age Author Refs
load previous
r2141:c135dd4d
Merging -r 1190 from lp:ipython.
Brian Granger
merge
0
r2140:eaba76cd
Merging -r 1189 from lp:ipython.
Brian Granger
merge
0
r2139:8d00aaab
Merging -r 1188 from lp:ipython.
Brian Granger
merge
0
r2138:039f3c15
Merging -r 1187 from lp:ipython.
Brian Granger
merge
0
r2137:349d1e30
Merging -r 1186 from lp:ipython.
Brian Granger
merge
0
r2136:7d9690af
Merging -r 1185 from lp:ipython.
Brian Granger
merge
0
r2135:40f4f41a
Update nose fix to avoid a python 2.6 deprecation warning on exc.message
Fernando Perez
0
r2134:d895eff1
Add a workaround for a nose problem so the test suite runs with nose 0.11.x
Fernando Perez
0
r2133:fcf58986
Fixes so the test suite runs when Twisted is not available. Other minor cleanups (formatting and unused imports)
Fernando Perez
0
r2132:b4c4d45e
Merging -r 1184 from lp:ipython.
Brian Granger
merge
0
r2131:8b463073
Merging -r 1182 from lp:ipython. Minor conflicts with removal of testing/attic.
Brian Granger
merge
0
r2130:d67308d5
Merging -r 1182 from lp:ipython.
Brian Granger
merge
0
r2129:2d78f0e2
Fixing small bug in import statement in clipboard.py.
Brian Granger
0
r2128:edd2e623
Merging -r 1181 from lp:ipython. A few changes were made to resolve conflicts: * clipboard.py moved to core. * Imports fixed.
Brian Granger
merge
0
r2127:73f01426
Merging -r 1180 from lp:ipthon No conflicts!
Brian Granger
merge
0
r2126:2fd04f05
Merging -r 1179 from lp:ipython. No conflicts.
Brian Granger
merge
0
r2125:2a3afbbd
Merging -r 1178 from lp:ipython. No major conflicts.
Brian Granger
merge
0
r2124:4a54d9d3
Merging -r 1177 from lp:ipython with fixes and resolutions. The main conflicts I had to fix were in ultratb. I have removed the ultraTB.py in IPython/kernel/core. Now IPython/core/ultratb.py is being used everywhere. Also I have protected the calls to ipapi.get to see if None is returned. This happens when trial IPython.kernel is run.
Brian Granger
merge
0
r2123:822f65e6
Merging revision 1176 from lp:ipython.
Brian Granger
merge
0
r2122:b3832225
Merging revision 1175 from lp:ipython.
Brian Granger
merge
0
load next
< 1 .. 1329 1330 1331 1332 1333 .. 1438 >
showing 20 out of 28742 commits