Merge branch 'master' of github.com:scikits-image/scikits-image

skimage/feature/greycomatrix.py

@@ -6,7 +6,7 @@ properties to characterize image textures.
 import numpy as np
 import skimage.util
 
-from _greycomatrix import _glcm_loop
+from ._greycomatrix import _glcm_loop
 
 
 def greycomatrix(image, distances, angles, levels=256, symmetric=False,

skimage/measure/find_contours.py

@@ -1,5 +1,5 @@
 import numpy as np
-import _find_contours
+from . import _find_contours
 
 from collections import deque
 

skimage/morphology/skeletonize.py

@@ -5,7 +5,7 @@ Algorithms for computing the skeleton of a binary image
 import numpy as np
 from scipy import ndimage
 
-from _skeletonize import _skeletonize_loop, _table_lookup_index
+from ._skeletonize import _skeletonize_loop, _table_lookup_index
 
 # --------- Skeletonization by morphological thinning ---------