Stefan van der Walt a064e3d8a2 Merge branch 'master' into v0.12.x ...

Conflicts:
	bento.info
	skimage/__init__.py

2016-03-07 12:34:28 -08:00

..

examples

Solving space convex_hull + fixing local_otsu

2016-03-01 11:27:55 +01:00

ext

MAINT: use with to close the file

2015-09-21 22:21:57 -04:00

release

Bring release notes and API changes in sync

2016-03-06 22:56:47 -08:00

source

Merge branch 'master' into v0.12.x

2016-03-07 12:34:28 -08:00

tools

Pick up Cython functions when building docs API

2015-04-11 23:59:57 -07:00

__init__.py

remove obsolete comments

2012-10-29 18:10:39 +01:00

gh-pages.py

gh-pages: Read skimage version from __init__.py

2015-04-12 23:53:56 -07:00

make.bat

Fix PYTHON executable and html script

2015-09-15 08:45:03 -05:00

Makefile

Ensure gallery pages are always generated

2015-10-23 22:49:22 -07:00