Shihab Uddin e14cbbd853 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	pom.xml

2015-03-30 13:53:30 +02:00

..

src

Merge remote-tracking branch 'upstream/master'

2015-03-30 13:53:30 +02: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-10-01 11:21:42 +02:00