From: unknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Date: Tue, 23 Apr 2013 12:26:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into creaDevManagerCMake
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e5db5721e091541b11e8cff659e5832fa0b5c563;hp=eadb37661531b59bf98dd976e29c5c5dba682bb7;p=crea.git

Merge remote-tracking branch 'refs/remotes/origin/master' into creaDevManagerCMake
---

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 3b64a1e..761a4f9 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -40,6 +40,7 @@
 #include "wx/statline.h"
 #include "wx/config.h"
 #include "CDMUtilities.h"
+#include "images/CIcon64.xpm"
 
 #include "creaDevManagerIds.h"
 #include "wxCDMMainDescriptionPanel.h"
@@ -145,6 +146,7 @@ bool wxCDMMainFrame::Create(
 
   CreateMenus();
   CreateControls();
+  SetIcon(wxIcon(CIcon64));
   return TRUE;
 }