From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 7 Mar 2014 10:25:07 +0000 (+0100)
Subject: Fix merge with the copy of mac folder and copy the mac folder in the
X-Git-Tag: v1.4.0~125
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=bf524e64011b3d10ce2ee7b86236e4c53efb8e5f;hp=bf524e64011b3d10ce2ee7b86236e4c53efb8e5f;p=clitk.git

Fix merge with the copy of mac folder and copy the mac folder in the
results directory
---