Merge branch 'master' into v0.12.x

Conflicts:
	bento.info
	skimage/__init__.py
This commit is contained in:
Stefan van der Walt
2016-03-07 12:34:28 -08:00
29 changed files with 58 additions and 64 deletions
+1
View File
@@ -14,6 +14,7 @@ Version 0.12
`skimage.transform.PiecewiseAffineTransform.affines_*` attributes
have been removed.
- `skimage.filters.denoise_*` have moved to `skimage.restoration.denoise_*`.
- `skimage.data.lena` has been removed.
Version 0.11
------------