Robert F Cooper 21ff12219a Merge branch 'master' of https://github.com/Eurybiadan/TwelveMonkeys.git ...

# Conflicts:
#	imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java

2016-05-18 12:51:10 -04:00

..

src

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

2016-05-18 12:51:10 -04:00

license.txt

It all works

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

pom.xml

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

2015-11-01 19:51:40 +01:00

todo.txt

Removed done item from todos.

2015-12-02 11:24:48 +01:00