Harald Kuhr 67e623f666 Merge commit 'hamnis/master' ...

Conflicts:
	imageio/imageio-batik/pom.xml
	imageio/imageio-core/pom.xml
	imageio/imageio-ico/pom.xml
	imageio/imageio-iff/pom.xml
	imageio/imageio-metadata/pom.xml
	imageio/imageio-pict/pom.xml
	imageio/imageio-psd/pom.xml
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml
	twelvemonkeys-core/pom.xml
	twelvemonkeys-imageio/pom.xml
	twelvemonkeys-servlet/pom.xml

2010-02-07 20:43:44 +01:00

..

src/test

It all works

2009-11-08 19:52:30 +01:00

license.txt

It all works

2009-11-08 19:52:30 +01:00

pom.xml

Merge commit 'hamnis/master'

2010-02-07 20:43:44 +01:00