]> Creatis software - crea.git/commitdiff
git://git.creatis.insa-lyon.fr / crea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40891c1 b0a57ab)
Feature #1711 CreaDevManager application implementation
authorunknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Mon, 11 Feb 2013 15:27:47 +0000 (16:27 +0100)
committerunknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Mon, 11 Feb 2013 15:27:47 +0000 (16:27 +0100)
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)

1  2 
appli/creaDevManager/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc appli/creaDevManager/CMakeLists.txt
Simple merge
Creatools base library