From: unknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Date: Mon, 11 Feb 2013 15:27:47 +0000 (+0100)
Subject: Feature #1711 CreaDevManager application implementation
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=crea.git;a=commitdiff_plain;h=e6d99bba438e086b10239a42492532ff194edb88

Feature #1711 CreaDevManager application implementation
Merge remote-tracking branch 'refs/remotes/origin/creaDevManager'

Conflicts:
	appli/creaNewProject/NewProject/CMakeLists.txt.in (solved)
	lib/creaDevManagerLib/CDMUtilities.cpp (solved)
	lib/creaDevManagerLib/CDMUtilities.h (solved)
	lib/creaDevManagerLib/modelCDMMain.cpp (solved)
	lib/creaDevManagerLib/wxCDMMainFrame.cpp (solved)
---

e6d99bba438e086b10239a42492532ff194edb88