Tony S Yu 53807d79a6 Merge pull request #233 from wilsaj:image-html-repr ...

Conflicts:
	skimage/io/tests/test_collection.py

2012-08-24 00:15:32 -04:00

..

color

Merge pull request #230 from dharhas/dharhas-lab-color-space

2012-08-01 07:02:38 -07:00

data

Merge pull request #256 from NeilYager/skeleton_fix

2012-08-20 14:50:51 -07:00

draw

COSMIT pep8

2012-06-29 11:27:23 +02:00

exposure

COSMIT pep8

2012-06-29 11:27:23 +02:00

feature

Merge pull request #239 from ahojnnes/texture

2012-08-20 14:37:30 -07:00

filter

BUG: Fix broken import in ctmf.

2012-08-20 07:55:17 -07:00

graph

COSMIT minor stype improvements, whitespace in error messages

2012-06-29 11:27:23 +02:00

io

Merge pull request #233 from wilsaj:image-html-repr

2012-08-24 00:15:32 -04:00

measure

Wrap long lines.

2012-08-16 16:16:56 +02:00

morphology

BUG: Remove uses of xrange for py3 compatibility.

2012-08-20 15:25:40 -07:00

scripts

COSMIT pep8

2012-06-29 11:27:23 +02:00

segmentation

BUG: Remove uses of xrange for py3 compatibility.

2012-08-20 15:25:40 -07:00

transform

Fix test cases of warps

2012-08-24 00:18:08 +02:00

util

COSMIT no spaces around power `**`. Fun: https://gist.github.com/1671995

2012-06-29 11:27:23 +02:00

__init__.py

pep8

2012-08-05 20:25:34 +01:00

_build.py

COSMIT pep8

2012-06-29 11:27:23 +02:00

setup.py

ENH using union find from morphology module

2012-08-03 11:37:10 +01:00