From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Fri, 26 Jul 2013 07:56:24 +0000 (+0200)
Subject: Merge branch 'master' into PacsConnection
X-Git-Tag: v1.4.0~2^2~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b65dbecbe7f7c5cfb8b746ebd4d63a96abc8cb59;p=clitk.git

Merge branch 'master' into PacsConnection
---

b65dbecbe7f7c5cfb8b746ebd4d63a96abc8cb59
diff --cc vv/vvMainWindow.cxx
index e3e5c99,15e1d91..c07100d
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -47,10 -47,8 +47,11 @@@ It is distributed under dual licenc
  #include "vvMeshReader.h"
  #include "vvSaveState.h"
  #include "vvReadState.h"
 +#ifdef CLITK_USE_PACS_CONNECTION
 +#include "vvQPacsConnection.h"
 +#endif
  #include "clitkConfiguration.h"
+ #include "clitkMatrix.h"
  
  // ITK include
  #include <itkImage.h>