Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' into S4U
authorMartin Quinson <martin.quinson@loria.fr>
Sun, 2 Aug 2015 22:28:56 +0000 (00:28 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Sun, 2 Aug 2015 22:28:56 +0000 (00:28 +0200)
commit3b53885f888f2539a533797e76a3f3ff84cdfe0c
tree42efe04945888688a73452d9fef69f025b5d0284
parentb59171fdbc29f44390977ab2bddce98ea6bca1e0
parent40a6b57b33ba92df9a10600b8d6fa10fff80c9d2
Merge branch 'master' into S4U

Conflicts:
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Distrib.cmake