Merge branch 'master' into 3.0-structure

Conflicts:
	imageio/imageio-psd/pom.xml
	twelvemonkeys-imageio/pom.xml
	twelvemonkeys-servlet/pom.xml
This commit is contained in:
Erlend Hamnaberg
2010-01-29 19:27:10 +01:00
64 changed files with 3851 additions and 672 deletions

View File

@@ -11,4 +11,6 @@
- http://vinetto.sourceforge.net/docs.html
- We probably want to support all of these
- Thumbnail (API) support? Does it make sense? It's all thumbnails..
DONE: