Commit Graph

2 Commits

Author SHA1 Message Date
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
Erlend Hamnaberg ee99550a65 Moving the rest 2010-01-29 19:40:12 +01:00