From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Fri, 2 Nov 2012 19:25:11 +0000 (-0700)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~281
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=47ac6a7e9e30deff5ff852c1585b4a86c5f52a8c;p=clitk.git

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

Conflicts:
	vv/vvMainWindow.cxx
---

47ac6a7e9e30deff5ff852c1585b4a86c5f52a8c
diff --cc vv/vvMainWindow.cxx
index 75b5cb4,5cf7c98..2eea26d
--- a/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