Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

Conflicts:
	vv/vvMainWindow.cxx

diff --cc vv/CMakeLists.txt
Simple merge

diff --cc vv/vvMainWindow.cxx
index 75b5cb44e68bd797e71dc4689b303e3c407d2d43,5cf7c9810cbeb46e7cc83f67773edc59be3f205a..2eea26d866b81d6c89793d62b8afe91a1cabca7a
--- 1/vv/vvMainWindow.cxx
--- 2/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -100,11 -100,11 +100,10 @@@
  #define COLUMN_RELOAD_IMAGE 6
  #define COLUMN_IMAGE_NAME 7
  
--#if CLITK_PRIVATE_FEATURES
-   #define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.nii.gz *.usf)"
 -  #define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.usf *.svl)"
++#define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.nii.gz *.usf)"
  #else
-   #define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.nii.gz)"
 -  #define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan)"
--#endif
++#define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.nii.gz)"
++
  
  /*Data Tree values
    0,Qt::UserRole full filename