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

..

imageio-batik

Merge commit 'hamnis/master'

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

imageio-core

Merge branch 'master' of git://github.com/haraldk/TwelveMonkeys

2010-02-07 19:03:55 +01:00

imageio-ico

Merge commit 'hamnis/master'

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

imageio-iff

2.3-SNAPSHOT to 3.0-SNAPSHOT

2010-01-29 20:06:18 +01:00

imageio-jmagick

2.3-SNAPSHOT to 3.0-SNAPSHOT

2010-01-29 20:06:18 +01:00

imageio-metadata

Merge commit 'hamnis/master'

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

imageio-pdf

2.3-SNAPSHOT to 3.0-SNAPSHOT

2010-01-29 20:06:18 +01:00

imageio-pict

Merge commit 'hamnis/master'

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

imageio-psd

2.3-SNAPSHOT to 3.0-SNAPSHOT

2010-01-29 20:06:18 +01:00

imageio-reference

Merge commit 'hamnis/master'

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

imageio-thumbsdb

Merge commit 'hamnis/master'

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

pom.xml

2.3-SNAPSHOT to 3.0-SNAPSHOT

2010-01-29 20:06:18 +01:00

todo.txt

It all works

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