[pubgit-commits-list] STMS branch master updated. 52d9a4ff6a971908206fcb9bed99942480de4ef8

[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 "Implementation of the Spatio-Temporal Mean-Shift based on ITK".

The branch, master has been updated
       via  52d9a4ff6a971908206fcb9bed99942480de4ef8 (commit)
       via  bd84bb06e5d774db2969d836670bddefbed6a1b9 (commit)
       via  2c235d4243c9fc08c6ba76efdf1944a23e586985 (commit)
       via  3f8dd39c10393bb9e1736914dd6e0b31aad6b7aa (commit)
      from  29f7ebaae72aa02beabb9f842816c275e297ffa9 (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=STMS.git;a=commitdiff;h=52d9a4ff6a971908206fcb9bed99942480de4ef8
commit 52d9a4ff6a971908206fcb9bed99942480de4ef8
Merge: bd84bb0 29f7eba
Author: Grenier Thomas <thomas.grenier at creatis.insa-lyon.fr>
Date:   Sun Dec 10 13:58:00 2017 +0100

    Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/STMS
    
    # Conflicts:
    #	Src/CMakeLists.txt


http://git.creatis.insa-lyon.fr/pubgit/?p=STMS.git;a=commitdiff;h=bd84bb06e5d774db2969d836670bddefbed6a1b9
commit bd84bb06e5d774db2969d836670bddefbed6a1b9
Author: Grenier Thomas <thomas.grenier at creatis.insa-lyon.fr>
Date:   Sun Dec 10 13:50:22 2017 +0100

    ignore files from user/site


http://git.creatis.insa-lyon.fr/pubgit/?p=STMS.git;a=commitdiff;h=2c235d4243c9fc08c6ba76efdf1944a23e586985
commit 2c235d4243c9fc08c6ba76efdf1944a23e586985
Author: Grenier Thomas <thomas.grenier at creatis.insa-lyon.fr>
Date:   Sun Dec 10 13:49:29 2017 +0100

    base of v2.0


http://git.creatis.insa-lyon.fr/pubgit/?p=STMS.git;a=commitdiff;h=3f8dd39c10393bb9e1736914dd6e0b31aad6b7aa
commit 3f8dd39c10393bb9e1736914dd6e0b31aad6b7aa
Author: Grenier Thomas <thomas.grenier at creatis.insa-lyon.fr>
Date:   Sun Dec 10 13:48:50 2017 +0100

    cmakelist


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

Summary of changes:
 .gitignore                      |   2 +
 CMakeLists.txt.user             | 232 ----------------------------------------
 Src/CMakeLists.txt              |   3 +
 Src/STMS_generateClosestMap.cxx | 122 +++++++++++++++++++++
 4 files changed, 127 insertions(+), 232 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 CMakeLists.txt.user
 create mode 100644 Src/STMS_generateClosestMap.cxx


hooks/post-receive
-- 
Implementation of the Spatio-Temporal Mean-Shift based on ITK