]> Creatis software - crea.git/commitdiff
Revert "Merge remote-tracking branch 'refs/remotes/origin/master' into creaDevManager...
authorunknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Tue, 23 Apr 2013 12:29:34 +0000 (14:29 +0200)
committerunknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Tue, 23 Apr 2013 12:29:34 +0000 (14:29 +0200)
This reverts commit e5db5721e091541b11e8cff659e5832fa0b5c563, reversing
changes made to eadb37661531b59bf98dd976e29c5c5dba682bb7.

lib/creaDevManagerLib/wxCDMMainFrame.cpp

index 761a4f98c2028b5fb6c59d4974e1036c745b3788..3b64a1e182cf118705ab70ef5c3ce968a04ccf56 100755 (executable)
@@ -40,7 +40,6 @@
 #include "wx/statline.h"
 #include "wx/config.h"
 #include "CDMUtilities.h"
-#include "images/CIcon64.xpm"
 
 #include "creaDevManagerIds.h"
 #include "wxCDMMainDescriptionPanel.h"
@@ -146,7 +145,6 @@ bool wxCDMMainFrame::Create(
 
   CreateMenus();
   CreateControls();
-  SetIcon(wxIcon(CIcon64));
   return TRUE;
 }