55 Commits

Author	SHA1	Message	Date
Erlend Hamnaberg	673527abe5	Merge branch 'master' of git://github.com/haraldk/TwelveMonkeys	2010-02-07 19:03:55 +01:00
Erlend Hamnaberg	41853cec7e	disabled some failing test cases and moved test case to correct spot	2010-01-29 20:03:37 +01:00
Erlend Hamnaberg	40e6486154	Moved files after merge	2010-01-29 19:36:02 +01:00
Erlend Hamnaberg	38d6c58eba	Merge branch 'master' into 3.0-structure ... Conflicts: imageio/imageio-psd/pom.xml twelvemonkeys-imageio/pom.xml twelvemonkeys-servlet/pom.xml	2010-01-29 19:27:10 +01:00
Erlend Hamnaberg	0786949c1c	It all works	2009-11-08 19:52:30 +01:00