Juan Nunez-Iglesias 1992c35a25 Merge pull request #1100 from vighneshbirodkar/ha ...

Hierarchical Merging

2015-01-30 16:05:58 +11:00

..

_shared

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

color

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

data

Resolve incorrect rebase

2015-01-22 07:36:48 -05:00

draw

Merge pull request #1324 from ahojnnes/rel-import

2015-01-25 15:26:34 -06:00

exposure

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

external

Beef up docstring

2014-12-12 21:18:48 -06:00

feature

Merge pull request #1324 from ahojnnes/rel-import

2015-01-25 15:26:34 -06:00

filter

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

filters

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

graph

Fixed tests

2015-01-29 21:06:10 +05:30

io

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

measure

Merge pull request #1319 from ahojnnes/geom-est

2015-01-28 13:31:25 -08:00

morphology

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

novice

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

restoration

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

scripts

Handle more warnings

2014-12-23 16:49:59 -06:00

segmentation

Use relative imports in skimage files

2015-01-22 07:36:48 -05:00

transform

Merge pull request #1319 from ahojnnes/geom-est

2015-01-28 13:31:25 -08:00

util

Clarify and fix docstrings

2015-01-22 11:38:37 +11:00

viewer

Fix invalid relative import

2015-01-22 07:39:08 -05:00

__init__.py

Do not try and guess the mpl backend

2014-12-27 10:52:30 -06:00

_build.py

Merge pull request #857 from guillempalou/slic-connectivity

2014-01-17 08:39:45 -08:00

setup.py

Rename and deprecate filter module to prevent shadowing of built-in keyword

2014-11-10 12:53:50 +02:00