[vistrails-dev] [GIT] VisTrails:

git-noreply at vistrails.org git-noreply at vistrails.org
Thu Jan 16 07:02:25 EST 2014


The project "VisTrails":

The branch, master has been updated
       via  dca373cf87160f48dcb098da350fd2f834aa3545 (commit)
       via  3dfd01654a5a92b239384bc1270b5e054dadcb5e (commit)
       via  4d3533847a0ab1627729b4a57522ea0930e766f2 (commit)
       via  b1f388bdd369f161b066ef1c2937ea4970a3f7d1 (commit)
       via  22c0f0cca93751095d79c5f7fac12ae082f4bc67 (commit)
       via  784414a617d284567b995367e3e308f3ba0cc64c (commit)
      from  48e1d0cccabd3087b28928450f54afd79e25e4dc (commit)


- Log -----------------------------------------------------------------
commit dca373cf87160f48dcb098da350fd2f834aa3545
Merge: 48e1d0c 3dfd016
Author: Tommy Ellqvist <tommy.ellqvist at nyu.edu>
Date:   Thu Jan 16 13:02:06 2014 +0100

Merge branch 'v2.1'

Conflicts:
vistrails/gui/application.py
vistrails/packages/matplotlib/artists.py
vistrails/packages/matplotlib/mpl_plots_diff.xml
vistrails/packages/matplotlib/plots.py
vistrails/tests/runtestsuite.py

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

Summary of changes:
 vistrails/gui/application.py          |    8 ++++++--
 vistrails/gui/collection/workspace.py |   13 +++++++------
 vistrails/gui/vistrail_view.py        |    9 ++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

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


More information about the vistrails-dev mailing list