[pubgit-commits-list] bbtk branch master updated. 00f00242cd642b58fc8281ad88c010656c519cbf

[root]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Black Box Tool Kit".

The branch, master has been updated
       via  00f00242cd642b58fc8281ad88c010656c519cbf (commit)
       via  1d7dc1ec3317d7e075251e2f6e61e353adbb20a9 (commit)
      from  968f7be1de6def3bb3422cf96fd530da670cff35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=bbtk.git;a=commitdiff;h=00f00242cd642b58fc8281ad88c010656c519cbf
commit 00f00242cd642b58fc8281ad88c010656c519cbf
Merge: 1d7dc1e 968f7be
Author: Eduardo DAVILA <eduardo.davila at creatis.insa-lyon.fr>
Date:   Fri Mar 21 15:28:39 2014 +0100

    Merge remote-tracking branch 'refs/remotes/origin/master'


http://git.creatis.insa-lyon.fr/pubgit/?p=bbtk.git;a=commitdiff;h=1d7dc1ec3317d7e075251e2f6e61e353adbb20a9
commit 1d7dc1ec3317d7e075251e2f6e61e353adbb20a9
Author: Eduardo DAVILA <eduardo.davila at creatis.insa-lyon.fr>
Date:   Fri Mar 21 15:28:20 2014 +0100

    2344	BBTK	Bug	New	Normal	Conflict between Update and Modfied vtk filters


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

Summary of changes:
 packages/vtk/src/bbvtkBinaryOperations.cxx         | 1 +
 packages/vtk/src/bbvtkExtractVtkImageFilter.cxx    | 1 +
 packages/vtk/src/bbvtkImageCastToUShort.cxx        | 1 +
 packages/vtk/src/bbvtkImageContinuousDilate3D.xml  | 1 +
 packages/vtk/src/bbvtkImageContinuousErode3D.xml   | 1 +
 packages/vtk/src/bbvtkImageDilateErode3D.xml       | 1 +
 packages/vtk/src/bbvtkImageGaussianSmooth.xml      | 3 ++-
 packages/vtk/src/bbvtkSegmentationConnectivity.cxx | 3 +++
 packages/vtk/src/bbvtkUnaryOperations.cxx          | 1 +
 packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx   | 1 +
 10 files changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Black Box Tool Kit