Commit Graph

3 Commits

Author SHA1 Message Date
Torstein Krause Johansen 0db676f1be Re-added test case lost in large merge
- Removed imageio-jmagick (again)

- Removed internal Maven repo

- fixed line endings on a number of files to avoid a humongous merge
  diff when getting changes into upstream

- Re-enabled a few tests
2016-06-29 14:16:44 +02:00
Shihab Uddin 5bd8c37c2d fixed merge conflicts 2012-09-26 11:51:25 +02:00
Erlend Hamnaberg 2f06f2de6d Cleanup of AreaOfInterest
Conflicts:
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
2012-09-26 11:47:53 +02:00