~fdo.perez/ipython/trunk-dev

Viewing all changes in revision 1175.

  • Committer: Fernando Perez
  • Date: 2009-03-15 01:38:00 UTC
  • mfrom: (1102.1.54 trunk-lp)
  • Revision ID: fernando.perez@berkeley.edu-20090315013800-jm9gco7gln43muyq
Merging from upstream (with a few local cleanups when resolving conflicts).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: