[vistrails-dev] [GIT] VisTrails:

git-noreply at vistrails.org git-noreply at vistrails.org
Mon Jan 13 19:25:25 EST 2014


The project "VisTrails":

The branch, dont-use-modules-as-data has been updated
       via  b7b744850816836c9bb9dac17c055a2ee14cb1a7 (commit)
       via  e94108a6b6e60e00fd8223849204e06d79286f2f (commit)
       via  069a93abda1ed070de0df0e4cc642b05b6d22d3b (commit)
       via  d4efec9b6c38c8833ca9a8e91d33480c6004e6b6 (commit)
       via  0e33a76dfb6cbf8b9f55894564c2f6ffb804006d (commit)
       via  efaaf81c02fd60938d97e8dcbb47f72b9bf0c453 (commit)
       via  51ee14956b238da4c46b5f5adcee06bf5fb62e2f (commit)
       via  5f4c0832a4f49dcad765db69b9e3c1828bef2d61 (commit)
       via  255f7614f7726642f135e10b5f611f9adf305ae6 (commit)
       via  8baca84ab993d30b0295d2056d9621b9509f04ec (commit)
       via  13da70d0b35f62635969c3ee6fadfda5e994e80e (commit)
       via  6d6c019122e37662dd1d2df271ccb75ffea5c18e (commit)
       via  3b2f6186cea9ca949478b2bed2a6851e6e179446 (commit)
       via  58309be57d2960a9542ba7dedf1218c2ce6b9c5e (commit)
       via  0bfde1baffb8be0643c4721bb65b873fb30ee557 (commit)
       via  0dcf99265ca1f164b33eeb37e2f01656e522c332 (commit)
       via  976255974f2b206f030b2436a5f10286844645b0 (commit)
       via  fda25c19ee3d115db55db149b7c58efccf0289ec (commit)
       via  9bb879d0803d87fc844c8057797c68020497f707 (commit)
       via  69952a6426e20097a420659d971b1565d545ca75 (commit)
       via  c5756b67b1625f62a71cd7b68ab038f53f025f81 (commit)
       via  ea337db8a69a490873b1c607eb285e66c46837c2 (commit)
      from  8a3d2deb51a69b7fdd1acc330caf34c404951403 (commit)


- Log -----------------------------------------------------------------
commit b7b744850816836c9bb9dac17c055a2ee14cb1a7
Merge: 8a3d2de e94108a
Author: Remi Rampin <remirampin at gmail.com>
Date:   Mon Jan 13 19:22:54 2014 -0500

Merge branch 'master' into 'dont-use-modules-as-data'

Conflicts:
vistrails/packages/tabledata/read/read_csv.py

-----------------------------------------------------------------------

Summary of changes:
 doc/usersguide/controlflow.rst                  |    4 +-
 examples/triangle_area.vt                       |  Bin 46215 -> 71991 bytes
 vistrails/core/interpreter/cached.py            |    5 +-
 vistrails/core/interpreter/job.py               |   13 ++--
 vistrails/core/modules/vistrails_module.py      |    1 +
 vistrails/core/vistrail/vistrail.py             |    8 ++-
 vistrails/gui/application_server.py             |   28 ++++-----
 vistrails/gui/job_monitor.py                    |   76 +++++++++++++++++++++-
 vistrails/gui/paramexplore/pe_view.py           |    2 +
 vistrails/gui/vistrail_controller.py            |   10 ++--
 vistrails/packages/controlflow/fold.py          |    1 +
 vistrails/packages/controlflow/looping.py       |    9 ++-
 vistrails/packages/tabledata/identifiers.py     |    2 +-
 vistrails/packages/tabledata/init.py            |   28 +++++++-
 vistrails/packages/tabledata/read/read_csv.py   |    3 +-
 vistrails/packages/tabledata/read/read_excel.py |   81 +++++++++++++----------
 vistrails/packages/tabledata/read/read_numpy.py |   15 ++--
 17 files changed, 203 insertions(+), 83 deletions(-)

-- 
VisTrails
git clone git at vgc.poly.edu:vistrails


More information about the vistrails-dev mailing list