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

..

__init__.py

BUG: Fix imports for Python 3.2.

2012-03-03 11:18:16 -08:00

_colormixer.pyx

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

_histograms.pyx

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

fits_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

fits_plugin.py

COSMIT pep8

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

freeimage_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

freeimage_plugin.py

STY: Align multi-line string statements.

2012-07-20 16:00:06 -04:00

gdal_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

gdal_plugin.py

COSMIT pep8

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

gtk_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

gtk_plugin.py

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

matplotlib_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

matplotlib_plugin.py

COSMIT pep8

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

null_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

null_plugin.py

Renaming: scikits.image -> skimage

2011-10-18 21:12:27 +02:00

pil_plugin.ini

ENH: Add show() to PIL plugin to support more consistent code over different plugins.

2012-02-10 14:11:51 -08:00

pil_plugin.py

remove superfluous conditional logic

2012-07-24 23:01:51 -05:00

plugin.py

COSMIT pep8

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

q_color_mixer.py

COSMIT fix ugly line breaks.

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

q_histogram.py

COSMIT pep8

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

qt_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

qt_plugin.py

open buffer on on byte_array

2012-07-21 10:23:20 -05:00

skivi.py

COSMIT pep8

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

test_plugin.ini

Renamed scikits.image to skimage

2011-10-18 21:12:27 +02:00

test_plugin.py

COSMIT pep8

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

tifffile_plugin.ini

Fix description of tifffile plugin

2012-02-21 17:55:32 -05:00

tifffile_plugin.py

DOC: Provide correct link for tifffile plugin.

2012-06-24 16:52:22 -07:00

util.py

COSMIT minor stype improvements, whitespace in error messages

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