Salome HOME
Merge branch 'V7_dev'
authorabn <adrien.bruneton@cea.fr>
Thu, 21 Jan 2016 14:00:31 +0000 (15:00 +0100)
committerabn <adrien.bruneton@cea.fr>
Thu, 21 Jan 2016 14:00:31 +0000 (15:00 +0100)
commit1e36a6710aab710674e20fbd89f6a9a8f238c023
tree29157c1adf1c05893064d8c560ec98cb3b50138d
parentbd238ae917aa20ba3fe2f7569883d619b7e4f7a9
parentcdf60ad48778bf895ad93de136454fb7b3bd8344
Merge branch 'V7_dev'

Conflicts:
cmake_files/SalomeMacros.cmake - staying aligned with master of KERNEL
cmake_files/SalomeMacros.cmake