[vistrails-dev] [GIT] VisTrails:

git-noreply at vistrails.org git-noreply at vistrails.org
Thu Jan 16 13:00:39 EST 2014


The project "VisTrails":

The branch, master has been updated
       via  2f401a790833bf01dde03096ceda3ef9096b5168 (commit)
       via  90975fc002113e9b4dd4eb71253173244f918579 (commit)
       via  d0509da82e7e46b6cb6749b48057120ac47a58a6 (commit)
       via  266bdc43cd34adb74d1cf9664421ba944b9c47b2 (commit)
       via  bb50981df2d924e358947bdbd7a07dbbdc338678 (commit)
       via  db8ae565135616626efc158fa3a2b1064cffae83 (commit)
       via  04b64489a89a65f5f1fecad35ae94f87e45cab00 (commit)
       via  820aab05a6856a20d0de7c9eb351bac1c90a3c57 (commit)
       via  26f3436360dac0c2336a8edc7c35192de90db0a0 (commit)
       via  e99b1e0c1f3d44e947802c61a65c743f3c6b8ba5 (commit)
       via  8d6229101aac3f4e0dc9abbca9f6ce871d690878 (commit)
       via  1626797ec14a45b64d288188bb71b545a074937c (commit)
       via  ce127fcab28a27052c8cb26cf6949f6c981e45ac (commit)
       via  0d331f282a619112c81d369fe8c643593b5aa49c (commit)
       via  cf51d9bfc86b2b2e4e0b32d6aaa20a0cb3d34e2a (commit)
       via  c4c13ecd7f94ee231033cd0b5bc7a74718d84ab1 (commit)
       via  c4138c26e69184ba5bda5a65608934307abcbc70 (commit)
       via  11cf64dc4ea2ad494c2cd1c62bc28d9d90617676 (commit)
       via  b4746aeda55ac7bc491f63b94df9f881590a3069 (commit)
       via  ac4d44d66093bdc8ba900e90b8f32385dcc1f3d8 (commit)
       via  fd572d93e00fa29df0e767761786e4c34f66ccf8 (commit)
       via  37981cc27da6cf917f6ec1f38fb7c2bae862ba18 (commit)
       via  29870bf655d93f09c7e4f79d1c72c99243bc7086 (commit)
       via  c202521a9140934656a10e29a6bac955dd4e1110 (commit)
      from  18c68d3c9e75dda70b4aa73d5dec0f89cdbb2420 (commit)


- Log -----------------------------------------------------------------
commit 2f401a790833bf01dde03096ceda3ef9096b5168
Merge: 18c68d3 90975fc
Author: Tommy Ellqvist <tommy.ellqvist at nyu.edu>
Date:   Thu Jan 16 19:00:25 2014 +0100

Merge branch 'v2.1'

Conflicts:
vistrails/core/debug.py
vistrails/core/utils/__init__.py

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

Summary of changes:
 dist/mac/Input/README                         |   13 ++++-
 dist/source/make-vistrails-src-release.py     |    2 +-
 dist/windows/Input/releaseNotes.txt           |   12 ++++-
 doc/usersguide/example.rst                    |    2 +-
 doc/usersguide/figures/tabledata/pipeline.png |  Bin 0 -> 18432 bytes
 doc/usersguide/figures/tabledata/results.png  |  Bin 0 -> 121460 bytes
 doc/usersguide/tabledata.rst                  |   60 +++++++++++++++++++++++++
 doc/usersguide/vtl/bikes.vtl                  |    1 +
 examples/bikes.vt                             |  Bin 0 -> 5546 bytes
 scripts/create_release_wiki_table.py          |    2 +-
 scripts/release_notes.py                      |    2 +-
 vistrails/core/debug.py                       |   32 +++++++++++++
 vistrails/core/system/__init__.py             |    2 +-
 13 files changed, 118 insertions(+), 10 deletions(-)
 create mode 100644 doc/usersguide/figures/tabledata/pipeline.png
 create mode 100644 doc/usersguide/figures/tabledata/results.png
 create mode 100644 doc/usersguide/tabledata.rst
 create mode 100644 doc/usersguide/vtl/bikes.vtl
 create mode 100644 examples/bikes.vt

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


More information about the vistrails-dev mailing list