[vistrails-dev] [GIT] VisTrails:

git-noreply at vistrails.org git-noreply at vistrails.org
Fri Jan 10 14:20:29 EST 2014


The project "VisTrails":

The branch, master has been updated
       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  c5756b67b1625f62a71cd7b68ab038f53f025f81 (commit)
      from  976255974f2b206f030b2436a5f10286844645b0 (commit)


- Log -----------------------------------------------------------------
commit 5f4c0832a4f49dcad765db69b9e3c1828bef2d61
Merge: 9762559 255f761
Author: Remi Rampin <remirampin at gmail.com>
Date:   Fri Jan 10 14:19:23 2014 -0500

Merge branch 'v2.1' into 'master'

Conflicts:
vistrails/gui/application_server.py

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

Summary of changes:
 doc/usersguide/controlflow.rst        |    4 ++--
 examples/triangle_area.vt             |  Bin 46215 -> 71991 bytes
 vistrails/core/vistrail/vistrail.py   |    4 ++--
 vistrails/gui/application_server.py   |   28 ++++++++++++----------------
 vistrails/gui/paramexplore/pe_view.py |    2 ++
 5 files changed, 18 insertions(+), 20 deletions(-)

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


More information about the vistrails-dev mailing list