8 Commits

Author SHA1 Message Date
Harald Kuhr
ae213dcf5e log4j removal 2020-01-09 19:18:15 +01:00
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
e14cbbd853 Merge remote-tracking branch 'upstream/master'
Conflicts:
	pom.xml
2015-03-30 13:53:30 +02:00
Harald Kuhr
c6558d7433 POM-changes for 3.1 development. 2014-10-01 13:43:23 +02:00
Shihab Uddin
d6e508662c Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys 2012-09-26 11:17:30 +02:00
Harald Kuhr
7846f497af TMS: Moving old junk to sandbox. 2012-09-25 14:50:47 +02:00
Harald Kuhr
52a97cfb2f Adding package-info files, that IDEA *silently deleted* instead of moving...?! :-P 2011-12-14 10:16:42 +01:00
Harald Kuhr
0b23d9f6c2 Moving old servlet stuff to sandbox. 2011-12-14 10:12:34 +01:00