Rune Bremnes 113480b9e7 Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys ...

Conflicts:
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml

2014-03-03 12:33:01 +01:00

..

src

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

2014-03-03 12:33:01 +01:00

license.txt

TMI-JPEG: Added license.

2013-06-27 10:20:32 +02:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2014-02-15 13:14:41 +01:00